Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into fixtrainerevodelay

2025-07-21 15:52:18 +02:00 · 2024-09-11 23:40:49 -04:00 · 2024-09-11 23:40:49 -04:00 · dcbef33def
commit dcbef33def
parent 14cb0b14b8 7ed7fec808
305 changed files with 5520 additions and 2827 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@ -1,7 +1,7 @@
 name: Bug Report
 description: Create a report to help us improve
 title: "[Bug] "
-labels: ["Bug"]
+labels: ["Bug", "Triage"]
 body:
  - type: markdown
    attributes:
@ -19,21 +19,12 @@ body:
      value: |
        ---
  - type: textarea
-    id: session-file
+    id: repro
    attributes:
-      label: Session export file
-      description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
+      label: Reproduction
+      description: Describe the steps to reproduce this bug. If applicable attach user/session data at the bottom
    validations:
-      required: false
-  - type: textarea
-    id: data-file
-    attributes:
-      label: User data export file
-      description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
-      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
-    validations:
-      required: false
+      required: true
  - type: markdown
    attributes:
      value: |
@ -60,48 +51,20 @@ body:
    attributes:
      value: |
        ---
-  - type: dropdown
-    id: os
+  - type: textarea
+    id: session-file
    attributes:
-      label: What OS did you observe the bug on?
-      multiple: true
-      options:
-        - PC/Windows
-        - Mac/OSX
-        - Linux
-        - iOS
-        - Android
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: os-other
-    attributes:
-      label: If other please specify
+      label: Session export file
+      description: Open Menu → ManageData → Export Session → Select slot. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
+      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
    validations:
      required: false
-  - type: markdown
+  - type: textarea
+    id: data-file
    attributes:
-      value: |
-        ---
-  - type: dropdown
-    id: browser
-    attributes:
-      label: Which browser do you use?
-      multiple: true
-      options:
-        - Chrome
-        - Firefox
-        - Safari
-        - Edge
-        - Opera
-        - Other
-    validations:
-      required: true
-  - type: input
-    id: browser-other
-    attributes:
-      label: If other please specify
+      label: User data export file
+      description: Open Menu → ManageData → Export Data. The file should now be in your `/Downloads` directory. Change the file extension type from `.prsv` to `.txt` (How to [Windows](https://www.guidingtech.com/how-to-change-file-type-on-windows/) | [Mac](https://support.apple.com/guide/mac-help/show-or-hide-filename-extensions-on-mac-mchlp2304/mac) | [iOS](https://www.guidingtech.com/change-file-type-extension-on-iphone/)).
+      placeholder: Focus me and then drop your file here (or use the upload button at the bottom)
    validations:
      required: false
  - type: markdown
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@ -1,7 +1,7 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: "[Feature] "
-labels: ["Enhancement"]
+labels: ["Enhancement", "Triage"]
 body:
  - type: markdown
    attributes:
--- a/.github/workflows/test-shard-template.yml
+++ b/.github/workflows/test-shard-template.yml
@ -0,0 +1,30 @@
+name: Test Template
+
+on:
+  workflow_call:
+    inputs:
+      project:
+        required: true
+        type: string
+      shard:
+        required: true
+        type: number
+      totalShards:
+        required: true
+        type: number
+
+jobs:
+  test:
+    name: Shard ${{ inputs.shard }} of ${{ inputs.totalShards }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v4
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - 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' || '' }}
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -15,91 +15,33 @@ on:
    types: [checks_requested]

 jobs:
-  run-misc-tests:  # Define a job named "run-tests"
-    name: Run misc tests  # Human-readable name for the job
-    runs-on: ubuntu-latest  # Specify the latest Ubuntu runner for the job
-
-    steps:
-      - name: Check out Git repository  # Step to check out the repository
-        uses: actions/checkout@v4  # Use the checkout action version 4
-
-      - 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
-
-      - name: Install Node.js dependencies  # Step to install Node.js dependencies
-        run: npm ci  # Use 'npm ci' to install dependencies
-
-      - name: pre-test # pre-test to check overrides
-        run: npx vitest run --project pre 
-      - name: test misc
-        run: npx vitest --project misc
-
-  run-abilities-tests:
-    name: Run abilities tests
-    runs-on: ubuntu-latest 
+  pre-test:
+    name: Run Pre-test
+    runs-on: ubuntu-latest
    steps:
      - name: Check out Git repository
        uses: actions/checkout@v4
+        with:
+          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: pre-test
-        run: npx vitest run --project pre 
-      - name: test abilities
-        run: npx vitest --project abilities
+      - name: Run Pre-test
+        working-directory: tests-action
+        run: npx vitest run --project pre ${{ !runner.debug && '--silent' || '' }}

-  run-items-tests:
-    name: Run items tests
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        run: npm ci
-      - name: pre-test
-        run: npx vitest run --project pre 
-      - name: test items
-        run: npx vitest --project items
-
-  run-moves-tests:
-    name: Run moves tests
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        run: npm ci
-      - name: pre-test
-        run: npx vitest run --project pre 
-      - name: test moves
-        run: npx vitest --project moves
-
-  run-battle-tests:
-    name: Run battle tests
-    runs-on: ubuntu-latest 
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-      - name: Install Node.js dependencies
-        run: npm ci
-      - name: pre-test
-        run: npx vitest run --project pre 
-      - name: test battle
-        run: npx vitest --project battle
+  run-tests:
+    name: Run Tests 
+    needs: [pre-test]
+    strategy:
+      matrix:
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+    uses: ./.github/workflows/test-shard-template.yml
+    with:
+      project: main
+      shard: ${{ matrix.shard }}
+      totalShards: 10
--- a/create-test-boilerplate.js
+++ b/create-test-boilerplate.js
@ -20,54 +20,58 @@ const type = args[0]; // "move" or "ability"
 let fileName = args[1]; // The file name

 if (!type || !fileName) {
-    console.error('Please provide both a type ("move", "ability", or "item") and a file name.');
-    process.exit(1);
+  console.error('Please provide a type ("move", "ability", or "item") and a file name.');
+  process.exit(1);
 }

-// Convert fileName from to snake_case if camelCase is given
-fileName = fileName.replace(/([a-z])([A-Z])/g, '$1_$2').toLowerCase();
+// Convert fileName from kebab-case or camelCase to snake_case
+fileName = fileName
+  .replace(/-+/g, '_') // Convert kebab-case (dashes) to underscores
+  .replace(/([a-z])([A-Z])/g, '$1_$2') // Convert camelCase to snake_case
+  .toLowerCase(); // Ensure all lowercase

 // Format the description for the test case
 const formattedName = fileName
-    .replace(/_/g, ' ')
-    .replace(/\b\w/g, char => char.toUpperCase());
+  .replace(/_/g, ' ')
+  .replace(/\b\w/g, char => char.toUpperCase());

 // Determine the directory based on the type
 let dir;
 let description;
 if (type === 'move') {
-    dir = path.join(__dirname, 'src', 'test', 'moves');
-    description = `Moves - ${formattedName}`;
+  dir = path.join(__dirname, 'src', 'test', 'moves');
+  description = `Moves - ${formattedName}`;
 } else if (type === 'ability') {
-    dir = path.join(__dirname, 'src', 'test', 'abilities');
-    description = `Abilities - ${formattedName}`;
+  dir = path.join(__dirname, 'src', 'test', 'abilities');
+  description = `Abilities - ${formattedName}`;
 } else if (type === "item") {
-    dir = path.join(__dirname, 'src', 'test', 'items');
-    description = `Items - ${formattedName}`;
+  dir = path.join(__dirname, 'src', 'test', 'items');
+  description = `Items - ${formattedName}`;
 } else {
-    console.error('Invalid type. Please use "move", "ability", or "item".');
-    process.exit(1);
+  console.error('Invalid type. Please use "move", "ability", or "item".');
+  process.exit(1);
 }

 // Ensure the directory exists
 if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
+  fs.mkdirSync(dir, { recursive: true });
 }

 // Create the file with the given name
 const filePath = path.join(dir, `${fileName}.test.ts`);

 if (fs.existsSync(filePath)) {
-    console.error(`File "${fileName}.test.ts" already exists.`);
-    process.exit(1);
+  console.error(`File "${fileName}.test.ts" already exists.`);
+  process.exit(1);
 }

 // Define the content template
 const content = `import { Abilities } from "#enums/abilities";
+import { Moves } from "#enums/moves";
+import { Species } from "#enums/species";
 import GameManager from "#test/utils/gameManager";
-import { SPLASH_ONLY } from "#test/utils/testUtils";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, it } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, it, expect } from "vitest";

 describe("${description}", () => {
  let phaserGame: Phaser.Game;
@ -87,14 +91,15 @@ describe("${description}", () => {
  beforeEach(() => {
    game = new GameManager(phaserGame);
    game.override
+      .moveset([Moves.SPLASH])
      .battleType("single")
      .enemyAbility(Abilities.BALL_FETCH)
-      .enemyMoveset(SPLASH_ONLY);
+      .enemyMoveset(Moves.SPLASH);
  });

  it("test case", async () => {
-    // await game.classicMode.startBattle();
-    // game.move.select();
+    // await game.classicMode.startBattle([Species.MAGIKARP]);
+    // game.move.select(Moves.SPLASH);
  }, TIMEOUT);
 });
 `;
--- a/eslint.config.js
+++ b/eslint.config.js
@ -1,7 +1,7 @@
 import tseslint from '@typescript-eslint/eslint-plugin';
 import stylisticTs from '@stylistic/eslint-plugin-ts'
 import parser from '@typescript-eslint/parser';
-// import imports from 'eslint-plugin-import'; // Disabled due to not being compatible with eslint v9
+import importX from 'eslint-plugin-import-x';

 export default [ 
    {
@ -11,7 +11,7 @@ export default [
            parser: parser
        },
        plugins: {
-            // imports: imports.configs.recommended // Disabled due to not being compatible with eslint v9
+            "import-x": importX,
            '@stylistic/ts': stylisticTs,
            '@typescript-eslint': tseslint
        },
@ -39,7 +39,8 @@ export default [
            }],
            "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 comma
+            "comma-spacing": ["error", { "before": false, "after": true }], // Enforces spacing after comma
+            "import-x/extensions": ["error", "never", { "json": "always" }], // Enforces no extension for imports unless json
        }
    }
 ]
--- a/package-lock.json
+++ b/package-lock.json
@ -28,6 +28,7 @@
 				"@vitest/coverage-istanbul": "^2.0.4",
 				"dependency-cruiser": "^16.3.10",
 				"eslint": "^9.7.0",
+				"eslint-plugin-import-x": "^4.2.1",
 				"jsdom": "^24.0.0",
 				"lefthook": "^1.6.12",
 				"phaser3spectorjs": "^0.0.8",
@ -2505,6 +2506,19 @@
 				"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",
@ -2687,6 +2701,155 @@
 				"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",
@ -3143,6 +3306,19 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"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",
@ -4854,6 +5030,16 @@
 				"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",
@ -5069,6 +5255,13 @@
 				"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",
@ -5460,6 +5653,13 @@
 				"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",
--- a/package.json
+++ b/package.json
@ -32,6 +32,7 @@
 		"@vitest/coverage-istanbul": "^2.0.4",
 		"dependency-cruiser": "^16.3.10",
 		"eslint": "^9.7.0",
+		"eslint-plugin-import-x": "^4.2.1",
 		"jsdom": "^24.0.0",
 		"lefthook": "^1.6.12",
 		"phaser3spectorjs": "^0.0.8",
--- a/public/images/events/egg-update_de.png
+++ b/public/images/events/egg-update_de.png
--- a/public/images/events/egg-update_en.png
+++ b/public/images/events/egg-update_en.png
--- a/public/images/events/egg-update_es.png
+++ b/public/images/events/egg-update_es.png
--- a/public/images/events/egg-update_fr.png
+++ b/public/images/events/egg-update_fr.png
--- a/public/images/events/egg-update_it.png
+++ b/public/images/events/egg-update_it.png
--- a/public/images/events/egg-update_ja.png
+++ b/public/images/events/egg-update_ja.png
--- a/public/images/events/egg-update_ko.png
+++ b/public/images/events/egg-update_ko.png
--- a/public/images/events/egg-update_pt-BR.png
+++ b/public/images/events/egg-update_pt-BR.png
--- a/public/images/events/egg-update_zh-CN.png
+++ b/public/images/events/egg-update_zh-CN.png
--- a/public/images/pokemon/exp/864.png
+++ b/public/images/pokemon/exp/864.png
--- a/public/images/pokemon/exp/shiny/864.png
+++ b/public/images/pokemon/exp/shiny/864.png
--- a/public/images/pokemon/variant/exp/864.json
+++ b/public/images/pokemon/variant/exp/864.json
@ -3,44 +3,36 @@
 		"bcb9be": "ae4c95",
 		"f9f2fc": "ffc0e5",
 		"7b787c": "793d6d",
-		"e1dfe2": "e88cc5",
-		"d0cfd0": "ce6bac",
-		"b8b4ba": "d7d2f6",
+		"dcd9dd": "e88cc5",
+		"c9c0ce": "ce6bac",
+		"cbc2d1": "d7d2f6",
 		"938f94": "b465b9",
-		"6c7275": "d3ffff",
-		"9362e6": "80a4ff",
-		"fcfcfc": "fcfcfc",
-		"4a494e": "a7e6e5",
-		"c6a4ff": "bed5ff",
-		"101010": "101010",
-		"3b3a3f": "4d8894",
-		"aeadae": "e88cc5",
-		"686568": "686568",
-		"6f6d71": "793d6d",
-		"b5b4b6": "ce6bac",
-		"706e6d": "7d7c75",
+		"fbf2ff": "d3ffff",
+		"e66294": "80a4ff",
+		"c6bbcb": "a7e6e5",
+		"ffa4c5": "bed5ff",
+		"7f806a": "4d8894",
+		"a8a0ac": "e88cc5",
+		"7c7a78": "793d6d",
+		"bbb4bc": "ce6bac",
 		"af9e9e": "42a2b1"
 	},
 	"2": {
 		"bcb9be": "055946",
 		"f9f2fc": "21be70",
 		"7b787c": "004140",
-		"e1dfe2": "12a169",
-		"d0cfd0": "0a7a57",
-		"b8b4ba": "567f83",
+		"dcd9dd": "12a169",
+		"c9c0ce": "0a7a57",
+		"cbc2d1": "567f83",
 		"938f94": "2b5458",
-		"6c7275": "874059",
-		"9362e6": "15c05f",
-		"fcfcfc": "fcfcfc",
-		"4a494e": "773050",
-		"c6a4ff": "8ff3a3",
-		"101010": "101010",
-		"3b3a3f": "4b1f28",
-		"aeadae": "12a169",
-		"686568": "686568",
-		"6f6d71": "004140",
-		"b5b4b6": "0a7a57",
-		"706e6d": "7d7c75",
+		"fbf2ff": "874059",
+		"e66294": "15c05f",
+		"c6bbcb": "773050",
+		"ffa4c5": "8ff3a3",
+		"7f806a": "4b1f28",
+		"a8a0ac": "12a169",
+		"7c7a78": "004140",
+		"bbb4bc": "0a7a57",
 		"af9e9e": "48c492"
 	}
-}
+}
--- a/public/images/ui/legacy/summary_moves_effect_de.png
+++ b/public/images/ui/legacy/summary_moves_effect_de.png
--- a/public/images/ui/legacy/summary_moves_effect_es.png
+++ b/public/images/ui/legacy/summary_moves_effect_es.png
--- a/public/images/ui/legacy/summary_moves_effect_fr.png
+++ b/public/images/ui/legacy/summary_moves_effect_fr.png
--- a/public/images/ui/legacy/summary_moves_effect_it.png
+++ b/public/images/ui/legacy/summary_moves_effect_it.png
--- a/public/images/ui/legacy/summary_moves_effect_pt-BR.png
+++ b/public/images/ui/legacy/summary_moves_effect_pt-BR.png
--- a/public/images/ui/legacy/summary_moves_effect_zh-CN.png
+++ b/public/images/ui/legacy/summary_moves_effect_zh-CN.png
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@ -2193,8 +2193,14 @@ export default class BattleScene extends SceneBase {
    return true;
  }

-  findPhase(phaseFilter: (phase: Phase) => boolean): Phase | undefined {
-    return this.phaseQueue.find(phaseFilter);
+  /**
+   * Find a specific {@linkcode Phase} in the phase queue.
+   *
+   * @param phaseFilter filter function to use to find the wanted phase
+   * @returns the found phase or undefined if none found
+   */
+  findPhase<P extends Phase = Phase>(phaseFilter: (phase: P) => boolean): P | undefined {
+    return this.phaseQueue.find(phaseFilter) as P;
  }

  tryReplacePhase(phaseFilter: (phase: Phase) => boolean, phase: Phase): boolean {
@ -2763,20 +2769,20 @@ export default class BattleScene extends SceneBase {
    const keys: string[] = [];
    const playerParty = this.getParty();
    playerParty.forEach(p => {
-      keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant));
-      keys.push("pkmn__" + p.species.getSpriteId(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant, true));
-      keys.push("cry/" + p.species.getCryKey(p.species.formIndex));
-      if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) {
-        keys.push("cry/"+p.getFusionSpeciesForm().getCryKey(p.fusionSpecies.formIndex));
+      keys.push(p.getSpriteKey(true));
+      keys.push(p.getBattleSpriteKey(true, true));
+      keys.push("cry/" + p.species.getCryKey(p.formIndex));
+      if (p.fusionSpecies) {
+        keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex));
      }
    });
    // enemyParty has to be operated on separately from playerParty because playerPokemon =/= enemyPokemon
    const enemyParty = this.getEnemyParty();
    enemyParty.forEach(p => {
-      keys.push(p.species.getSpriteKey(p.gender === Gender.FEMALE, p.species.formIndex, p.shiny, p.variant));
-      keys.push("cry/" + p.species.getCryKey(p.species.formIndex));
-      if (p.fusionSpecies && p.getSpeciesForm() !== p.getFusionSpeciesForm()) {
-        keys.push("cry/"+p.getFusionSpeciesForm().getCryKey(p.fusionSpecies.formIndex));
+      keys.push(p.getSpriteKey(true));
+      keys.push("cry/" + p.species.getCryKey(p.formIndex));
+      if (p.fusionSpecies) {
+        keys.push("cry/"+p.fusionSpecies.getCryKey(p.fusionFormIndex));
      }
    });
    return keys;
--- a/src/battle.ts
+++ b/src/battle.ts
@ -1,5 +1,4 @@
 import BattleScene from "./battle-scene";
-import { EnemyPokemon, PlayerPokemon, QueuedMove } from "./field/pokemon";
 import { Command } from "./ui/command-ui-handler";
 import * as Utils from "./utils";
 import Trainer, { TrainerVariant } from "./field/trainer";
@ -7,6 +6,7 @@ import { GameMode } from "./game-mode";
 import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
 import { PokeballType } from "./data/pokeball";
 import { trainerConfigs } from "#app/data/trainer-config";
+import Pokemon, { EnemyPokemon, PlayerPokemon, QueuedMove } from "#app/field/pokemon";
 import { ArenaTagType } from "#enums/arena-tag-type";
 import { BattleSpec } from "#enums/battle-spec";
 import { Moves } from "#enums/moves";
@ -38,6 +38,11 @@ export interface TurnCommand {
    args?: any[];
 }

+export interface FaintLogEntry {
+  pokemon: Pokemon,
+  turn: number
+}
+
 interface TurnCommands {
    [key: number]: TurnCommand | null
 }
@ -69,6 +74,8 @@ export default class Battle {
  public playerFaints: number = 0;
  /** The number of times a Pokemon on the enemy's side has fainted this battle */
  public enemyFaints: number = 0;
+  public playerFaintsHistory: FaintLogEntry[] = [];
+  public enemyFaintsHistory: FaintLogEntry[] = [];

  private rngCounter: number = 0;

--- a/src/constants.ts
+++ b/src/constants.ts
@ -0,0 +1 @@
+export const PLAYER_PARTY_MAX_SIZE = 6;
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@ -1595,8 +1595,8 @@ 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)) {
-    super();
+  constructor(attackCondition: PokemonAttackCondition = (user, target, move) => (move.category !== MoveCategory.STATUS), showAbility: boolean = true) {
+    super(showAbility);

    this.attackCondition = attackCondition;
  }
@ -1624,6 +1624,40 @@ export class PostAttackAbAttr extends AbAttr {
  }
 }

+/**
+ * Ability attribute for Gorilla Tactics
+ * @extends PostAttackAbAttr
+ */
+export class GorillaTacticsAbAttr extends PostAttackAbAttr {
+  constructor() {
+    super((user, target, move) => true, false);
+  }
+
+  /**
+   *
+   * @param {Pokemon} pokemon the {@linkcode Pokemon} with this ability
+   * @param passive n/a
+   * @param simulated whether the ability is being simulated
+   * @param defender n/a
+   * @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;
+    }
+
+    if (pokemon.getTag(BattlerTagType.GORILLA_TACTICS)) {
+      return false;
+    }
+
+    pokemon.addTag(BattlerTagType.GORILLA_TACTICS);
+    return true;
+  }
+}
+
 export class PostAttackStealHeldItemAbAttr extends PostAttackAbAttr {
  private stealCondition: PokemonAttackCondition | null;

@ -3923,7 +3957,7 @@ export class PostBattleLootAbAttr extends PostBattleAbAttr {
 }

 export class PostFaintAbAttr extends AbAttr {
-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
    return false;
  }
 }
@ -3974,7 +4008,7 @@ export class PostFaintClearWeatherAbAttr extends PostFaintAbAttr {
   * @param args N/A
   * @returns {boolean} Returns true if the weather clears, otherwise false.
   */
-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
+  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
    const weatherType = pokemon.scene.arena.weather?.weatherType;
    let turnOffWeather = false;

@ -4022,8 +4056,8 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
    this.damageRatio = damageRatio;
  }

-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (move.checkFlag(MoveFlags.MAKES_CONTACT, attacker, pokemon)) {
+  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);
      pokemon.scene.getField(true).map(p => applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled, simulated));
      if (cancelled.value || attacker.hasAbilityWithAttr(BlockNonDirectDamageAbAttr)) {
@ -4052,8 +4086,8 @@ export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
    super ();
  }

-  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker: Pokemon, move: Move, hitResult: HitResult, args: any[]): boolean {
-    if (!simulated) {
+  applyPostFaint(pokemon: Pokemon, passive: boolean, simulated: boolean, attacker?: Pokemon, move?: Move, hitResult?: HitResult, ...args: any[]): boolean {
+    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.turnData.damageTaken += damage;
@ -4711,7 +4745,7 @@ export function applyPostBattleAbAttrs(attrType: Constructor<PostBattleAbAttr>,
 }

 export function applyPostFaintAbAttrs(attrType: Constructor<PostFaintAbAttr>,
-  pokemon: Pokemon, attacker: Pokemon, move: Move, hitResult: HitResult, simulated: boolean = false, ...args: any[]): Promise<void> {
+  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);
 }

@ -5597,7 +5631,7 @@ export function initAbilities() {
      .bypassFaint()
      .partial(),
    new Ability(Abilities.GORILLA_TACTICS, 8)
-      .unimplemented(),
+      .attr(GorillaTacticsAbAttr),
    new Ability(Abilities.NEUTRALIZING_GAS, 8)
      .attr(SuppressFieldAbilitiesAbAttr)
      .attr(UncopiableAbilityAbAttr)
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@ -107,8 +107,8 @@ export interface TerrainBattlerTag {
 * to select restricted moves.
 */
 export abstract class MoveRestrictionBattlerTag extends BattlerTag {
-  constructor(tagType: BattlerTagType, turnCount: integer, sourceMove?: Moves, sourceId?: integer) {
-    super(tagType, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], turnCount, sourceMove, sourceId);
+  constructor(tagType: BattlerTagType, lapseType: BattlerTagLapseType | BattlerTagLapseType[], turnCount: integer, sourceMove?: Moves, sourceId?: integer) {
+    super(tagType, lapseType, turnCount, sourceMove, sourceId);
  }

  /** @override */
@ -119,7 +119,9 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
      const move = phase.move;

      if (this.isMoveRestricted(move.moveId)) {
-        pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId));
+        if (this.interruptedText(pokemon, move.moveId)) {
+          pokemon.scene.queueMessage(this.interruptedText(pokemon, move.moveId));
+        }
        phase.cancel();
      }

@ -155,7 +157,52 @@ export abstract class MoveRestrictionBattlerTag extends BattlerTag {
   * @param {Moves} move {@linkcode Moves} ID of the move being interrupted
   * @returns {string} text to display when the move is interrupted
   */
-  abstract interruptedText(pokemon: Pokemon, move: Moves): string;
+  interruptedText(pokemon: Pokemon, move: Moves): string {
+    return "";
+  }
+}
+
+/**
+ * Tag representing the "Throat Chop" effect. Pokemon with this tag cannot use sound-based moves.
+ * @see {@link https://bulbapedia.bulbagarden.net/wiki/Throat_Chop_(move) | Throat Chop}
+ * @extends MoveRestrictionBattlerTag
+ */
+export class ThroatChoppedTag extends MoveRestrictionBattlerTag {
+  constructor() {
+    super(BattlerTagType.THROAT_CHOPPED, [ BattlerTagLapseType.TURN_END, BattlerTagLapseType.PRE_MOVE ], 2, Moves.THROAT_CHOP);
+  }
+
+  /**
+   * Checks if a {@linkcode Moves | move} is restricted by Throat Chop.
+   * @override
+   * @param {Moves} move the {@linkcode Moves | move} to check for sound-based restriction
+   * @returns true if the move is sound-based
+   */
+  override isMoveRestricted(move: Moves): boolean {
+    return allMoves[move].hasFlag(MoveFlags.SOUND_BASED);
+  }
+
+  /**
+   * 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 {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 });
+  }
+
+  /**
+   * 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
+   * @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) });
+  }
 }

 /**
@ -167,7 +214,7 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
  private moveId: Moves = Moves.NONE;

  constructor(sourceId: number) {
-    super(BattlerTagType.DISABLED, 4, Moves.DISABLE, sourceId);
+    super(BattlerTagType.DISABLED, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 4, Moves.DISABLE, sourceId);
  }

  /** @override */
@ -178,7 +225,7 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
  /**
   * @override
   *
-   * Ensures that move history exists on `pokemon` and has a valid move. If so, sets the {@link moveId} and shows a message.
+   * Ensures that move history exists on `pokemon` and has a valid move. If so, sets the {@linkcode moveId} and shows a message.
   * Otherwise the move ID will not get assigned and this tag will get removed next turn.
   */
  override onAdd(pokemon: Pokemon): void {
@ -207,7 +254,12 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
    return i18next.t("battle:moveDisabled", { moveName: allMoves[move].name });
  }

-  /** @override */
+  /**
+   * @override
+   * @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
+   */
  override interruptedText(pokemon: Pokemon, move: Moves): string {
    return i18next.t("battle:disableInterruptedMove", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon), moveName: allMoves[move].name });
  }
@ -219,6 +271,72 @@ export class DisabledTag extends MoveRestrictionBattlerTag {
  }
 }

+/**
+ * Tag used by Gorilla Tactics to restrict the user to using only one move.
+ * @extends MoveRestrictionBattlerTag
+ */
+export class GorillaTacticsTag extends MoveRestrictionBattlerTag {
+  private moveId = Moves.NONE;
+
+  constructor() {
+    super(BattlerTagType.GORILLA_TACTICS, BattlerTagLapseType.CUSTOM, 0);
+  }
+
+  /** @override */
+  override isMoveRestricted(move: Moves): boolean {
+    return move !== this.moveId;
+  }
+
+  /**
+   * @override
+   * @param {Pokemon} pokemon the {@linkcode Pokemon} to check if the tag can be added
+   * @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);
+  }
+
+  /**
+   * Ensures that move history exists on {@linkcode Pokemon} and has a valid move.
+   * If so, sets the {@linkcode moveId} and increases the user's Attack by 50%.
+   * @override
+   * @param {Pokemon} pokemon the {@linkcode Pokemon} to add the tag to
+   */
+  override onAdd(pokemon: Pokemon): void {
+    const lastValidMove = this.getLastValidMove(pokemon);
+
+    if (!lastValidMove) {
+      return;
+    }
+
+    this.moveId = lastValidMove;
+    pokemon.setStat(Stat.ATK, pokemon.getStat(Stat.ATK, false) * 1.5, false);
+  }
+
+  /**
+   *
+   * @override
+   * @param {Pokemon} pokemon n/a
+   * @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) });
+  }
+
+  /**
+   * Gets the last valid move from the pokemon's move history.
+   * @param {Pokemon} pokemon {@linkcode Pokemon} to get the last valid move from
+   * @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);
+
+    return move?.move;
+  }
+}
+
 /**
 * BattlerTag that represents the "recharge" effects of moves like Hyper Beam.
 */
@ -1180,6 +1298,13 @@ export class ProtectedTag extends BattlerTag {
  }
 }

+/** Base class for `BattlerTag`s that block damaging moves but not status moves */
+export class DamageProtectedTag extends ProtectedTag {}
+
+/**
+ * `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 {
  private damageRatio: number;

@ -1215,7 +1340,11 @@ export class ContactDamageProtectedTag extends ProtectedTag {
  }
 }

-export class ContactStatStageChangeProtectedTag extends ProtectedTag {
+/**
+ * `BattlerTag` class for moves that block damaging moves and lower enemy stats if the enemy's move makes contact
+ * Used by {@linkcode Moves.KINGS_SHIELD}, {@linkcode Moves.OBSTRUCT}, {@linkcode Moves.SILK_TRAP}
+ */
+export class ContactStatStageChangeProtectedTag extends DamageProtectedTag {
  private stat: BattleStat;
  private levels: number;

@ -1271,7 +1400,11 @@ export class ContactPoisonProtectedTag extends ProtectedTag {
  }
 }

-export class ContactBurnProtectedTag extends ProtectedTag {
+/**
+ * `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);
  }
@ -1984,7 +2117,38 @@ export class ExposedTag extends BattlerTag {
  }
 }

+/**
+ * Tag that doubles the type effectiveness of Fire-type moves.
+ * @extends BattlerTag
+ */
+export class TarShotTag extends BattlerTag {
+  constructor() {
+    super(BattlerTagType.TAR_SHOT, BattlerTagLapseType.CUSTOM, 0);
+  }

+  /**
+   * If the Pokemon is terastallized, the tag cannot be added.
+   * @param {Pokemon} pokemon the {@linkcode Pokemon} to which the tag is added
+   * @returns whether the tag is applied
+   */
+  override canAdd(pokemon: Pokemon): boolean {
+    return !pokemon.isTerastallized();
+  }
+
+  override onAdd(pokemon: Pokemon): void {
+    pokemon.scene.queueMessage(i18next.t("battlerTags:tarShotOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
+  }
+}
+
+/**
+ * Retrieves a {@linkcode BattlerTag} based on the provided tag type, turn count, source move, and source ID.
+ *
+ * @param {BattlerTagType} tagType the type of the {@linkcode BattlerTagType}.
+ * @param turnCount the turn count.
+ * @param {Moves} sourceMove the source {@linkcode Moves}.
+ * @param sourceId the source ID.
+ * @returns {BattlerTag} the corresponding {@linkcode BattlerTag} object.
+ */
 export function getBattlerTag(tagType: BattlerTagType, turnCount: number, sourceMove: Moves, sourceId: number): BattlerTag {
  switch (tagType) {
  case BattlerTagType.RECHARGING:
@ -2125,6 +2289,12 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
  case BattlerTagType.GULP_MISSILE_ARROKUDA:
  case BattlerTagType.GULP_MISSILE_PIKACHU:
    return new GulpMissileTag(tagType, sourceMove);
+  case BattlerTagType.TAR_SHOT:
+    return new TarShotTag();
+  case BattlerTagType.THROAT_CHOPPED:
+    return new ThroatChoppedTag();
+  case BattlerTagType.GORILLA_TACTICS:
+    return new GorillaTacticsTag();
  case BattlerTagType.NONE:
  default:
    return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
--- a/src/data/dialogue.ts
+++ b/src/data/dialogue.ts
@ -1569,8 +1569,7 @@ export const trainerTypeDialogue: TrainerTypeDialogue = {
      "dialogue:roark.victory.1",
      "dialogue:roark.victory.2",
      "dialogue:roark.victory.3",
-      "dialogue:roark.victory.4",
-      "dialogue:roark.victory.5"
+      "dialogue:roark.victory.4"
    ],
    defeat: [
      "dialogue:roark.defeat.1",
--- a/src/data/egg.ts
+++ b/src/data/egg.ts
@ -222,7 +222,7 @@ 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) {
+      if (this._species === Species.PHIONE && this._sourceType === EggSourceType.SAME_SPECIES_EGG) {
        pokemonSpecies = getPokemonSpecies(Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE) ? Species.PHIONE : Species.MANAPHY);
      }

@ -326,7 +326,8 @@ export class Egg {
      break;
    }

-    return Utils.randSeedInt(baseChance * Math.pow(2, 3 - this.tier)) ? Utils.randSeedInt(3) : 3;
+    const tierMultiplier = this.isManaphyEgg() ? 2 : Math.pow(2, 3 - this.tier);
+    return Utils.randSeedInt(baseChance * tierMultiplier) ? Utils.randSeedInt(3) : 3;
  }

  private getEggTierDefaultHatchWaves(eggTier?: EggTier): number {
@ -361,7 +362,12 @@ export class Egg {
     * the species that was the legendary focus at the time
     */
    if (this.isManaphyEgg()) {
-      const rand = Utils.randSeedInt(MANAPHY_EGG_MANAPHY_RATE);
+      /**
+       * Adding a technicality to make unit tests easier: By making this check pass
+       * 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);
      return rand ? Species.PHIONE : Species.MANAPHY;
    } else if (this.tier === EggTier.MASTER
      && this._sourceType === EggSourceType.GACHA_LEGENDARY) {
--- a/src/data/move.ts
+++ b/src/data/move.ts
@ -81,6 +81,16 @@ export enum MoveFlags {
  MAKES_CONTACT     = 1 << 0,
  IGNORE_PROTECT    = 1 << 1,
  IGNORE_VIRTUAL    = 1 << 2,
+  /**
+   * 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 << 3,
  HIDE_USER         = 1 << 4,
  HIDE_TARGET       = 1 << 5,
@ -93,19 +103,20 @@ export enum MoveFlags {
   * @see {@linkcode Move.recklessMove()}
   */
  RECKLESS_MOVE     = 1 << 10,
+  /** Indicates a move should be affected by {@linkcode Abilities.BULLETPROOF} */
  BALLBOMB_MOVE     = 1 << 11,
+  /** Grass types and pokemon with {@linkcode Abilities.OVERCOAT} are immune to powder moves */
  POWDER_MOVE       = 1 << 12,
+  /** Indicates a move should trigger {@linkcode Abilities.DANCER} */
  DANCE_MOVE        = 1 << 13,
+  /** Indicates a move should trigger {@linkcode Abilities.WIND_RIDER} */
  WIND_MOVE         = 1 << 14,
+  /** Indicates a move should trigger {@linkcode Abilities.TRIAGE} */
  TRIAGE_MOVE       = 1 << 15,
  IGNORE_ABILITIES  = 1 << 16,
-  /**
-   * Enables all hits of a multi-hit move to be accuracy checked individually
-   */
+  /** Enables all hits of a multi-hit move to be accuracy checked individually */
  CHECK_ALL_HITS   = 1 << 17,
-  /**
-   * Indicates a move is able to be redirected to allies in a double battle if the attacker faints
-   */
+  /** Indicates a move is able to be redirected to allies in a double battle if the attacker faints */
  REDIRECT_COUNTER = 1 << 18,
 }

@ -118,22 +129,22 @@ export default class Move implements Localizable {
  private _type: Type;
  private _category: MoveCategory;
  public moveTarget: MoveTarget;
-  public power: integer;
-  public accuracy: integer;
-  public pp: integer;
+  public power: number;
+  public accuracy: number;
+  public pp: number;
  public effect: string;
-  public chance: integer;
-  public priority: integer;
-  public generation: integer;
-  public attrs: MoveAttr[];
-  private conditions: MoveCondition[];
-  private flags: integer;
-  private nameAppend: string;
+  /** The chance of a move's secondary effects activating */
+  public chance: number;
+  public priority: number;
+  public generation: number;
+  public attrs: MoveAttr[] = [];
+  private conditions: MoveCondition[] = [];
+  /** The move's {@linkcode MoveFlags} */
+  private flags: number = 0;
+  private nameAppend: string = "";

-  constructor(id: Moves, type: Type, category: MoveCategory, defaultMoveTarget: MoveTarget, power: integer, accuracy: integer, pp: integer, chance: integer, priority: integer, generation: integer) {
+  constructor(id: Moves, type: Type, category: MoveCategory, defaultMoveTarget: MoveTarget, power: number, accuracy: number, pp: number, chance: number, priority: number, generation: number) {
    this.id = id;
-
-    this.nameAppend = "";
    this._type = type;
    this._category = category;
    this.moveTarget = defaultMoveTarget;
@ -144,10 +155,6 @@ export default class Move implements Localizable {
    this.priority = priority;
    this.generation = generation;

-    this.attrs = [];
-    this.conditions = [];
-
-    this.flags = 0;
    if (defaultMoveTarget === MoveTarget.USER) {
      this.setFlag(MoveFlags.IGNORE_PROTECT, true);
    }
@ -377,7 +384,7 @@ export default class Move implements Localizable {
   * @param makesContact The value (boolean) to set the flag to
   * @returns The {@linkcode Move} that called this function
   */
-  makesContact(makesContact: boolean = true): this { // TODO: is true the correct default?
+  makesContact(makesContact: boolean = true): this {
    this.setFlag(MoveFlags.MAKES_CONTACT, makesContact);
    return this;
  }
@ -388,7 +395,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.CURSE}
   * @returns The {@linkcode Move} that called this function
   */
-  ignoresProtect(ignoresProtect: boolean = true): this { // TODO: is `true` the correct default?
+  ignoresProtect(ignoresProtect: boolean = true): this {
    this.setFlag(MoveFlags.IGNORE_PROTECT, ignoresProtect);
    return this;
  }
@ -399,7 +406,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.NATURE_POWER}
   * @returns The {@linkcode Move} that called this function
   */
-  ignoresVirtual(ignoresVirtual: boolean = true): this { // TODO: is `true` the correct default?
+  ignoresVirtual(ignoresVirtual: boolean = true): this {
    this.setFlag(MoveFlags.IGNORE_VIRTUAL, ignoresVirtual);
    return this;
  }
@ -410,7 +417,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.UPROAR}
   * @returns The {@linkcode Move} that called this function
   */
-  soundBased(soundBased: boolean = true): this { // TODO: is `true` the correct default?
+  soundBased(soundBased: boolean = true): this {
    this.setFlag(MoveFlags.SOUND_BASED, soundBased);
    return this;
  }
@ -421,7 +428,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.TELEPORT}
   * @returns The {@linkcode Move} that called this function
   */
-  hidesUser(hidesUser: boolean = true): this { // TODO: is `true` the correct default?
+  hidesUser(hidesUser: boolean = true): this {
    this.setFlag(MoveFlags.HIDE_USER, hidesUser);
    return this;
  }
@ -432,7 +439,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.WHIRLWIND}
   * @returns The {@linkcode Move} that called this function
   */
-  hidesTarget(hidesTarget: boolean = true): this { // TODO: is `true` the correct default?
+  hidesTarget(hidesTarget: boolean = true): this {
    this.setFlag(MoveFlags.HIDE_TARGET, hidesTarget);
    return this;
  }
@ -443,7 +450,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.BITE}
   * @returns The {@linkcode Move} that called this function
   */
-  bitingMove(bitingMove: boolean = true): this { // TODO: is `true` the correct default?
+  bitingMove(bitingMove: boolean = true): this {
    this.setFlag(MoveFlags.BITING_MOVE, bitingMove);
    return this;
  }
@ -454,7 +461,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.WATER_PULSE}
   * @returns The {@linkcode Move} that called this function
   */
-  pulseMove(pulseMove: boolean = true): this { // TODO: is `true` the correct default?
+  pulseMove(pulseMove: boolean = true): this {
    this.setFlag(MoveFlags.PULSE_MOVE, pulseMove);
    return this;
  }
@ -465,7 +472,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.DRAIN_PUNCH}
   * @returns The {@linkcode Move} that called this function
   */
-  punchingMove(punchingMove: boolean = true): this { // TODO: is `true` the correct default?
+  punchingMove(punchingMove: boolean = true): this {
    this.setFlag(MoveFlags.PUNCHING_MOVE, punchingMove);
    return this;
  }
@ -476,7 +483,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.X_SCISSOR}
   * @returns The {@linkcode Move} that called this function
   */
-  slicingMove(slicingMove: boolean = true): this { // TODO: is `true` the correct default?
+  slicingMove(slicingMove: boolean = true): this {
    this.setFlag(MoveFlags.SLICING_MOVE, slicingMove);
    return this;
  }
@ -487,7 +494,7 @@ export default class Move implements Localizable {
   * @param recklessMove The value to set the flag to
   * @returns The {@linkcode Move} that called this function
   */
-  recklessMove(recklessMove: boolean = true): this { // TODO: is `true` the correct default?
+  recklessMove(recklessMove: boolean = true): this {
    this.setFlag(MoveFlags.RECKLESS_MOVE, recklessMove);
    return this;
  }
@ -498,7 +505,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.ELECTRO_BALL}
   * @returns The {@linkcode Move} that called this function
   */
-  ballBombMove(ballBombMove: boolean = true): this { // TODO: is `true` the correct default?
+  ballBombMove(ballBombMove: boolean = true): this {
    this.setFlag(MoveFlags.BALLBOMB_MOVE, ballBombMove);
    return this;
  }
@ -509,7 +516,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.STUN_SPORE}
   * @returns The {@linkcode Move} that called this function
   */
-  powderMove(powderMove: boolean = true): this { // TODO: is `true` the correct default?
+  powderMove(powderMove: boolean = true): this {
    this.setFlag(MoveFlags.POWDER_MOVE, powderMove);
    return this;
  }
@ -520,7 +527,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.PETAL_DANCE}
   * @returns The {@linkcode Move} that called this function
   */
-  danceMove(danceMove: boolean = true): this { // TODO: is `true` the correct default?
+  danceMove(danceMove: boolean = true): this {
    this.setFlag(MoveFlags.DANCE_MOVE, danceMove);
    return this;
  }
@ -531,7 +538,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.HURRICANE}
   * @returns The {@linkcode Move} that called this function
   */
-  windMove(windMove: boolean = true): this { // TODO: is `true` the correct default?
+  windMove(windMove: boolean = true): this {
    this.setFlag(MoveFlags.WIND_MOVE, windMove);
    return this;
  }
@ -542,7 +549,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.ABSORB}
   * @returns The {@linkcode Move} that called this function
   */
-  triageMove(triageMove: boolean = true): this { // TODO: is `true` the correct default?
+  triageMove(triageMove: boolean = true): this {
    this.setFlag(MoveFlags.TRIAGE_MOVE, triageMove);
    return this;
  }
@ -553,7 +560,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.SUNSTEEL_STRIKE}
   * @returns The {@linkcode Move} that called this function
   */
-  ignoresAbilities(ignoresAbilities: boolean = true): this { // TODO: is `true` the correct default?
+  ignoresAbilities(ignoresAbilities: boolean = true): this {
    this.setFlag(MoveFlags.IGNORE_ABILITIES, ignoresAbilities);
    return this;
  }
@ -564,7 +571,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.TRIPLE_AXEL}
   * @returns The {@linkcode Move} that called this function
   */
-  checkAllHits(checkAllHits: boolean = true): this { // TODO: is `true` the correct default?
+  checkAllHits(checkAllHits: boolean = true): this {
    this.setFlag(MoveFlags.CHECK_ALL_HITS, checkAllHits);
    return this;
  }
@ -575,7 +582,7 @@ export default class Move implements Localizable {
   * example: @see {@linkcode Moves.METAL_BURST}
   * @returns The {@linkcode Move} that called this function
   */
-  redirectCounter(redirectCounter: boolean = true): this { // TODO: is `true` the correct default?
+  redirectCounter(redirectCounter: boolean = true): this {
    this.setFlag(MoveFlags.REDIRECT_COUNTER, redirectCounter);
    return this;
  }
@ -2779,28 +2786,26 @@ export class ResetStatsAttr extends MoveEffectAttr {
    super();
    this.targetAllPokemon = targetAllPokemon;
  }
-  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
-    if (!super.apply(user, target, move, args)) {
-      return false;
-    }
-
+  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
      const activePokemon = user.scene.getField(true);
-      activePokemon.forEach(p => this.resetStats(p));
+      activePokemon.forEach(p => promises.push(this.resetStats(p)));
      target.scene.queueMessage(i18next.t("moveTriggers:statEliminated"));
    } else { // Affects only the single target when Clear Smog is used
-      this.resetStats(target);
+      promises.push(this.resetStats(target));
      target.scene.queueMessage(i18next.t("moveTriggers:resetStats", {pokemonName: getPokemonNameWithAffix(target)}));
    }

+    await Promise.all(promises);
    return true;
  }

-  resetStats(pokemon: Pokemon) {
+  async resetStats(pokemon: Pokemon): Promise<void> {
    for (const s of BATTLE_STATS) {
      pokemon.setStatStage(s, 0);
    }
-    pokemon.updateInfo();
+    return pokemon.updateInfo();
  }
 }

@ -3472,7 +3477,7 @@ export class SpitUpPowerAttr extends VariablePowerAttr {
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
    const stockpilingTag = user.getTag(StockpilingTag);

-    if (stockpilingTag !== null && stockpilingTag.stockpiledCount > 0) {
+    if (stockpilingTag && stockpilingTag.stockpiledCount > 0) {
      const power = args[0] as Utils.IntegerHolder;
      power.value = this.multiplier * stockpilingTag.stockpiledCount;
      return true;
@ -3490,7 +3495,7 @@ export class SwallowHealAttr extends HealAttr {
  apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
    const stockpilingTag = user.getTag(StockpilingTag);

-    if (stockpilingTag !== null && stockpilingTag?.stockpiledCount > 0) {
+    if (stockpilingTag && stockpilingTag.stockpiledCount > 0) {
      const stockpiled = stockpilingTag.stockpiledCount;
      let healRatio: number;

@ -4747,7 +4752,7 @@ export class AddArenaTagAttr extends MoveEffectAttr {
      return false;
    }

-    if (move.chance < 0 || move.chance === 100 || user.randSeedInt(100) < move.chance) {
+    if ((move.chance < 0 || move.chance === 100 || user.randSeedInt(100) < move.chance) && user.getLastXMoves(1)[0].result === MoveResult.SUCCESS) {
      user.scene.arena.addTag(this.tagType, this.turnCount, move.id, user.id, (this.selfSideTarget ? user : target).isPlayer() ? ArenaTagSide.PLAYER : ArenaTagSide.ENEMY);
      return true;
    }
@ -5987,9 +5992,8 @@ export class SwapStatAttr extends MoveEffectAttr {
  }

  /**
-   * Takes the average of the user's and target's corresponding current
-   * {@linkcode stat} values and sets that stat to the average for both
-   * temporarily.
+   * Swaps the user's and target's corresponding current
+   * {@linkcode EffectiveStat | stat} values
   * @param user the {@linkcode Pokemon} that used the move
   * @param target the {@linkcode Pokemon} that the move was used on
   * @param move N/A
@ -6013,6 +6017,62 @@ export class SwapStatAttr extends MoveEffectAttr {
  }
 }

+/**
+ * Attribute used to switch the user's own stats.
+ * Used by Power Shift.
+ * @extends MoveEffectAttr
+ */
+export class ShiftStatAttr extends MoveEffectAttr {
+  private statToSwitch: EffectiveStat;
+  private statToSwitchWith: EffectiveStat;
+
+  constructor(statToSwitch: EffectiveStat, statToSwitchWith: EffectiveStat) {
+    super();
+
+    this.statToSwitch = statToSwitch;
+    this.statToSwitchWith = statToSwitchWith;
+  }
+
+  /**
+   * Switches the user's stats based on the {@linkcode statToSwitch} and {@linkcode statToSwitchWith} attributes.
+   * @param {Pokemon} user the {@linkcode Pokemon} that used the move
+   * @param target n/a
+   * @param move n/a
+   * @param args n/a
+   * @returns whether the effect was applied
+   */
+  override apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
+    if (!super.apply(user, target, move, args)) {
+      return false;
+    }
+
+    const firstStat = user.getStat(this.statToSwitch, false);
+    const secondStat = user.getStat(this.statToSwitchWith, false);
+
+    user.setStat(this.statToSwitch, secondStat, false);
+    user.setStat(this.statToSwitchWith, firstStat, false);
+
+    user.scene.queueMessage(i18next.t("moveTriggers:shiftedStats", {
+      pokemonName: getPokemonNameWithAffix(user),
+      statToSwitch: i18next.t(getStatKey(this.statToSwitch)),
+      statToSwitchWith: i18next.t(getStatKey(this.statToSwitchWith))
+    }));
+
+    return true;
+  }
+
+  /**
+   * Encourages the user to use the move if the stat to switch with is greater than the stat to switch.
+   * @param {Pokemon} user the {@linkcode Pokemon} that used the move
+   * @param target n/a
+   * @param move n/a
+   * @returns number of points to add to the user's benefit score
+   */
+  override getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): integer {
+    return user.getStat(this.statToSwitchWith, false) > user.getStat(this.statToSwitch, false) ? 10 : 0;
+  }
+}
+
 /**
 * Attribute used for status moves, namely Power Split and Guard Split,
 * that take the average of a user's and target's corresponding
@ -6217,12 +6277,42 @@ export class VariableTargetAttr extends MoveAttr {
  }
 }

+/**
+ * Attribute for {@linkcode Moves.AFTER_YOU}
+ *
+ * [After You - Move | Bulbapedia](https://bulbapedia.bulbagarden.net/wiki/After_You_(move))
+ */
+export class AfterYouAttr extends MoveEffectAttr {
+  /**
+   * Allows the target of this move to act right after the user.
+   *
+   * @param user {@linkcode Pokemon} that is using the move.
+   * @param target {@linkcode Pokemon} that will move right after this move is used.
+   * @param move {@linkcode Move} {@linkcode Moves.AFTER_YOU}
+   * @param _args N/A
+   * @returns true
+   */
+  override apply(user: Pokemon, target: Pokemon, _move: Move, _args: any[]): boolean {
+    user.scene.queueMessage(i18next.t("moveTriggers:afterYou", {targetName: getPokemonNameWithAffix(target)}));
+
+    //Will find next acting phase of the targeted pokémon, delete it and queue it next on successful delete.
+    const nextAttackPhase = target.scene.findPhase<MovePhase>((phase) => phase.pokemon === target);
+    if (nextAttackPhase && target.scene.tryRemovePhase((phase: MovePhase) => phase.pokemon === target)) {
+      target.scene.prependToPhase(new MovePhase(target.scene, target, [...nextAttackPhase.targets], nextAttackPhase.move), MovePhase);
+    }
+
+    return true;
+  }
+}
+
 const failOnGravityCondition: MoveConditionFunc = (user, target, move) => !user.scene.arena.getTag(ArenaTagType.GRAVITY);

 const failOnBossCondition: MoveConditionFunc = (user, target, move) => !target.isBossImmune();

 const failOnMaxCondition: MoveConditionFunc = (user, target, move) => !target.isMax();

+const failIfSingleBattle: MoveConditionFunc = (user, target, move) => user.scene.currentBattle.double;
+
 const failIfDampCondition: MoveConditionFunc = (user, target, move) => {
  const cancelled = new Utils.BooleanHolder(false);
  user.scene.getField(true).map(p=>applyAbAttrs(FieldPreventExplosiveMovesAbAttr, p, cancelled));
@ -7053,6 +7143,7 @@ export function initMoves() {
    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)
+      .partial()
      .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL),
    new AttackMove(Moves.FALSE_SWIPE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2)
      .attr(SurviveDamageAttr),
@ -7332,9 +7423,11 @@ export function initMoves() {
      .attr(HighCritAttr)
      .attr(StatusEffectAttr, StatusEffect.BURN),
    new StatusMove(Moves.MUD_SPORT, Type.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)
+      .partial()
      .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL)
      .ballBombMove(),
    new AttackMove(Moves.NEEDLE_ARM, Type.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3)
@ -7456,6 +7549,7 @@ export function initMoves() {
      .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)
+      .ignoresProtect()
      .attr(AddArenaTagAttr, ArenaTagType.WATER_SPORT, 5)
      .target(MoveTarget.BOTH_SIDES),
    new SelfStatusMove(Moves.CALM_MIND, Type.PSYCHIC, -1, 20, -1, 0, 3)
@ -7484,6 +7578,7 @@ export function initMoves() {
      .attr(AddBattlerTagAttr, BattlerTagType.ROOSTED, true, false)
      .triageMove(),
    new StatusMove(Moves.GRAVITY, Type.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)
@ -7870,7 +7965,10 @@ export function initMoves() {
      .attr(AbilityGiveAttr),
    new StatusMove(Moves.AFTER_YOU, Type.NORMAL, -1, 15, -1, 0, 5)
      .ignoresProtect()
-      .unimplemented(),
+      .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)
      .soundBased()
      .partial(),
@ -7924,7 +8022,15 @@ export function initMoves() {
    new StatusMove(Moves.REFLECT_TYPE, Type.NORMAL, -1, 15, -1, 0, 5)
      .attr(CopyTypeAttr),
    new AttackMove(Moves.RETALIATE, Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 5, -1, 0, 5)
-      .partial(),
+      .attr(MovePowerMultiplierAttr, (user, target, move) => {
+        const turn = user.scene.currentBattle.turn;
+        const lastPlayerFaint = user.scene.currentBattle.playerFaintsHistory[user.scene.currentBattle.playerFaintsHistory.length - 1];
+        const lastEnemyFaint = user.scene.currentBattle.enemyFaintsHistory[user.scene.currentBattle.enemyFaintsHistory.length - 1];
+        return (
+          (lastPlayerFaint !== undefined && turn - lastPlayerFaint.turn === 1 && user.isPlayer()) ||
+          (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)
      .attr(UserHpDamageAttr)
      .attr(SacrificialAttrOnHit),
@ -8404,7 +8510,7 @@ export function initMoves() {
      .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)
-      .partial(),
+      .attr(AddBattlerTagAttr, BattlerTagType.THROAT_CHOPPED),
    new AttackMove(Moves.POLLEN_PUFF, Type.BUG, MoveCategory.SPECIAL, 90, 100, 15, -1, 0, 7)
      .attr(StatusCategoryOnAllyAttr)
      .attr(HealOnAllyAttr, 0.5, true, false)
@ -8644,7 +8750,7 @@ export function initMoves() {
      .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)
      .attr(StatStageChangeAttr, [ Stat.SPD ], -1)
-      .partial(),
+      .attr(AddBattlerTagAttr, BattlerTagType.TAR_SHOT, false),
    new StatusMove(Moves.MAGIC_POWDER, Type.PSYCHIC, 100, 20, -1, 0, 8)
      .attr(ChangeTypeAttr, Type.PSYCHIC)
      .powderMove(),
@ -8894,7 +9000,8 @@ export function initMoves() {
    new AttackMove(Moves.PSYSHIELD_BASH, Type.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)
-      .unimplemented(),
+      .target(MoveTarget.USER)
+      .attr(ShiftStatAttr, Stat.ATK, Stat.DEF),
    new AttackMove(Moves.STONE_AXE, Type.ROCK, MoveCategory.PHYSICAL, 65, 90, 15, 100, 0, 8)
      .attr(AddArenaTrapTagHitAttr, ArenaTagType.STEALTH_ROCK)
      .slicingMove(),
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@ -1,8 +1,9 @@
-import { PokemonFormChangeItemModifier } from "../modifier/modifier";
+import { PokemonFormChangeItemModifier, TerastallizeModifier } from "../modifier/modifier";
 import Pokemon from "../field/pokemon";
 import { SpeciesFormKey } from "./pokemon-species";
 import { StatusEffect } from "./status-effect";
 import { MoveCategory, allMoves } from "./move";
+import { Type } from "./type";
 import { Constructor } from "#app/utils";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
@ -357,6 +358,41 @@ export class SpeciesDefaultFormMatchTrigger extends SpeciesFormChangeTrigger {
  }
 }

+/**
+ * Class used for triggering form changes based on the user's Tera type.
+ * Used by Ogerpon and Terapagos.
+ * @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;
+  }
+
+  /**
+   * 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 !!pokemon.scene.findModifier(m => m instanceof TerastallizeModifier && m.pokemonId === pokemon.id && m.teraType === this.teraType);
+  }
+}
+
+/**
+ * Class used for triggering form changes based on the user's lapsed Tera type.
+ * Used by Ogerpon and Terapagos.
+ * @extends SpeciesFormChangeTrigger
+ */
+export class SpeciesFormChangeLapseTeraTrigger extends SpeciesFormChangeTrigger {
+  canChange(pokemon: Pokemon): boolean {
+    return !!pokemon.scene.findModifier(m => m instanceof TerastallizeModifier && m.pokemonId === pokemon.id);
+  }
+}
+
 /**
 * Class used for triggering form changes based on weather.
 * Used by Castform and Cherrim.
@ -592,6 +628,23 @@ export const pokemonFormChanges: PokemonFormChanges = {
  [Species.ALTARIA]: [
    new SpeciesFormChange(Species.ALTARIA, "", SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.ALTARIANITE))
  ],
+  [Species.CASTFORM]: [
+    new SpeciesFormChange(Species.CASTFORM, "", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
+    new SpeciesFormChange(Species.CASTFORM, "", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
+    new SpeciesFormChange(Species.CASTFORM, "sunny", "", new SpeciesFormChangeActiveTrigger(), true),
+    new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeActiveTrigger(), true),
+    new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeActiveTrigger(), true)
+  ],
  [Species.BANETTE]: [
    new SpeciesFormChange(Species.BANETTE, "", SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.BANETTITE))
  ],
@ -627,6 +680,11 @@ export const pokemonFormChanges: PokemonFormChanges = {
    new SpeciesFormChange(Species.DEOXYS, "normal", "defense", new SpeciesFormChangeItemTrigger(FormChangeItem.HARD_METEORITE)),
    new SpeciesFormChange(Species.DEOXYS, "normal", "speed", new SpeciesFormChangeItemTrigger(FormChangeItem.SMOOTH_METEORITE))
  ],
+  [Species.CHERRIM]: [
+    new SpeciesFormChange(Species.CHERRIM, "overcast", "sunshine", new SpeciesFormChangeWeatherTrigger(Abilities.FLOWER_GIFT, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ]), true),
+    new SpeciesFormChange(Species.CHERRIM, "sunshine", "overcast", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FLOWER_GIFT, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG, WeatherType.HAIL, WeatherType.HEAVY_RAIN, WeatherType.SNOW, WeatherType.RAIN ]), true),
+    new SpeciesFormChange(Species.CHERRIM, "sunshine", "overcast", new SpeciesFormChangeActiveTrigger(), true)
+  ],
  [Species.LOPUNNY]: [
    new SpeciesFormChange(Species.LOPUNNY, "", SpeciesFormKey.MEGA, new SpeciesFormChangeItemTrigger(FormChangeItem.LOPUNNITE))
  ],
@ -822,6 +880,14 @@ export const pokemonFormChanges: PokemonFormChanges = {
  [Species.SANDACONDA]: [
    new SpeciesFormChange(Species.SANDACONDA, "", SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS))
  ],
+  [Species.CRAMORANT]: [
+    new SpeciesFormChange(Species.CRAMORANT, "", "gulping", new SpeciesFormChangeManualTrigger, true, new SpeciesFormChangeCondition(p => p.getHpRatio() >= .5)),
+    new SpeciesFormChange(Species.CRAMORANT, "", "gorging", new SpeciesFormChangeManualTrigger, true, new SpeciesFormChangeCondition(p => p.getHpRatio() < .5)),
+    new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeManualTrigger, true),
+    new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeManualTrigger, true),
+    new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeActiveTrigger(false), true),
+    new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeActiveTrigger(false), true)
+  ],
  [Species.TOXTRICITY]: [
    new SpeciesFormChange(Species.TOXTRICITY, "amped", SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)),
    new SpeciesFormChange(Species.TOXTRICITY, "lowkey", SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)),
@ -848,6 +914,10 @@ export const pokemonFormChanges: PokemonFormChanges = {
    new SpeciesFormChange(Species.ALCREMIE, "caramel-swirl", SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS)),
    new SpeciesFormChange(Species.ALCREMIE, "rainbow-swirl", SpeciesFormKey.GIGANTAMAX, new SpeciesFormChangeItemTrigger(FormChangeItem.MAX_MUSHROOMS))
  ],
+  [Species.EISCUE]: [
+    new SpeciesFormChange(Species.EISCUE, "", "no-ice", new SpeciesFormChangeManualTrigger(), true),
+    new SpeciesFormChange(Species.EISCUE, "no-ice", "", new SpeciesFormChangeManualTrigger(), true)
+  ],
  [Species.MORPEKO]: [
    new SpeciesFormChange(Species.MORPEKO, "full-belly", "hangry", new SpeciesFormChangeManualTrigger(), true),
    new SpeciesFormChange(Species.MORPEKO, "hangry", "full-belly", new SpeciesFormChangeManualTrigger(), true)
@ -883,58 +953,24 @@ 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 SpeciesFormChangeManualTrigger(), true), //When holding a Grass Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "teal-mask-tera", "teal-mask", new SpeciesFormChangeManualTrigger(), true), //When no longer holding a Grass Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "wellspring-mask", "wellspring-mask-tera", new SpeciesFormChangeManualTrigger(), true), //When holding a Water Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "wellspring-mask-tera", "wellspring-mask", new SpeciesFormChangeManualTrigger(), true), //When no longer holding a Water Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "hearthflame-mask", "hearthflame-mask-tera", new SpeciesFormChangeManualTrigger(), true), //When holding a Fire Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "hearthflame-mask-tera", "hearthflame-mask", new SpeciesFormChangeManualTrigger(), true), //When no longer holding a Fire Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "cornerstone-mask", "cornerstone-mask-tera", new SpeciesFormChangeManualTrigger(), true), //When holding a Rock Tera Shard
-    new SpeciesFormChange(Species.OGERPON, "cornerstone-mask-tera", "cornerstone-mask", new SpeciesFormChangeManualTrigger(), true) //When no longer holding a Rock Tera Shard
+    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))
  ],
  [Species.TERAPAGOS]: [
    new SpeciesFormChange(Species.TERAPAGOS, "", "terastal", new SpeciesFormChangeManualTrigger(), true),
-    new SpeciesFormChange(Species.TERAPAGOS, "terastal", "stellar", new SpeciesFormChangeManualTrigger(), true), //When holding a Stellar Tera Shard
-    new SpeciesFormChange(Species.TERAPAGOS, "stellar", "terastal", new SpeciesFormChangeManualTrigger(), true) //When no longer holding a Stellar Tera Shard
+    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))
  ],
  [Species.GALAR_DARMANITAN]: [
    new SpeciesFormChange(Species.GALAR_DARMANITAN, "", "zen", new SpeciesFormChangeManualTrigger(), true),
    new SpeciesFormChange(Species.GALAR_DARMANITAN, "zen", "", new SpeciesFormChangeManualTrigger(), true)
  ],
-  [Species.EISCUE]: [
-    new SpeciesFormChange(Species.EISCUE, "", "no-ice", new SpeciesFormChangeManualTrigger(), true),
-    new SpeciesFormChange(Species.EISCUE, "no-ice", "", new SpeciesFormChangeManualTrigger(), true),
-  ],
-  [Species.CRAMORANT]: [
-    new SpeciesFormChange(Species.CRAMORANT, "", "gulping", new SpeciesFormChangeManualTrigger, true, new SpeciesFormChangeCondition(p => p.getHpRatio() >= .5)),
-    new SpeciesFormChange(Species.CRAMORANT, "", "gorging", new SpeciesFormChangeManualTrigger, true, new SpeciesFormChangeCondition(p => p.getHpRatio() < .5)),
-    new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeManualTrigger, true),
-    new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeManualTrigger, true),
-    new SpeciesFormChange(Species.CRAMORANT, "gulping", "", new SpeciesFormChangeActiveTrigger(false), true),
-    new SpeciesFormChange(Species.CRAMORANT, "gorging", "", new SpeciesFormChangeActiveTrigger(false), true),
-  ],
-  [Species.CASTFORM]: [
-    new SpeciesFormChange(Species.CASTFORM, "", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
-    new SpeciesFormChange(Species.CASTFORM, "rainy", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
-    new SpeciesFormChange(Species.CASTFORM, "snowy", "sunny", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.SUNNY, WeatherType.HARSH_SUN]), true),
-    new SpeciesFormChange(Species.CASTFORM, "", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
-    new SpeciesFormChange(Species.CASTFORM, "sunny", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
-    new SpeciesFormChange(Species.CASTFORM, "snowy", "rainy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.RAIN, WeatherType.HEAVY_RAIN]), true),
-    new SpeciesFormChange(Species.CASTFORM, "", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
-    new SpeciesFormChange(Species.CASTFORM, "sunny", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
-    new SpeciesFormChange(Species.CASTFORM, "rainy", "snowy", new SpeciesFormChangeWeatherTrigger(Abilities.FORECAST, [WeatherType.HAIL, WeatherType.SNOW]), true),
-    new SpeciesFormChange(Species.CASTFORM, "sunny", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
-    new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
-    new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FORECAST, [WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG]), true),
-    new SpeciesFormChange(Species.CASTFORM, "sunny", "", new SpeciesFormChangeActiveTrigger(), true),
-    new SpeciesFormChange(Species.CASTFORM, "rainy", "", new SpeciesFormChangeActiveTrigger(), true),
-    new SpeciesFormChange(Species.CASTFORM, "snowy", "", new SpeciesFormChangeActiveTrigger(), true),
-  ],
-  [Species.CHERRIM]: [
-    new SpeciesFormChange(Species.CHERRIM, "overcast", "sunshine", new SpeciesFormChangeWeatherTrigger(Abilities.FLOWER_GIFT, [ WeatherType.SUNNY, WeatherType.HARSH_SUN ]), true),
-    new SpeciesFormChange(Species.CHERRIM, "sunshine", "overcast", new SpeciesFormChangeRevertWeatherFormTrigger(Abilities.FLOWER_GIFT, [ WeatherType.NONE, WeatherType.SANDSTORM, WeatherType.STRONG_WINDS, WeatherType.FOG, WeatherType.HAIL, WeatherType.HEAVY_RAIN, WeatherType.SNOW, WeatherType.RAIN ]), true),
-    new SpeciesFormChange(Species.CHERRIM, "sunshine", "overcast", new SpeciesFormChangeActiveTrigger(), true),
-  ],
 };

 export function initPokemonForms() {
--- a/src/data/weather.ts
+++ b/src/data/weather.ts
@ -88,12 +88,14 @@ export class Weather {
    return 1;
  }

-  isMoveWeatherCancelled(move: Move): boolean {
+  isMoveWeatherCancelled(user: Pokemon, move: Move): boolean {
+    const moveType = user.getMoveType(move);
+
    switch (this.weatherType) {
    case WeatherType.HARSH_SUN:
-      return move instanceof AttackMove && move.type === Type.WATER;
+      return move instanceof AttackMove && moveType === Type.WATER;
    case WeatherType.HEAVY_RAIN:
-      return move instanceof AttackMove && move.type === Type.FIRE;
+      return move instanceof AttackMove && moveType === Type.FIRE;
    }

    return false;
--- a/src/enums/battler-tag-type.ts
+++ b/src/enums/battler-tag-type.ts
@ -73,4 +73,7 @@ export enum BattlerTagType {
  SHELL_TRAP = "SHELL_TRAP",
  DRAGON_CHEER = "DRAGON_CHEER",
  NO_RETREAT = "NO_RETREAT",
+  GORILLA_TACTICS = "GORILLA_TACTICS",
+  THROAT_CHOPPED = "THROAT_CHOPPED",
+  TAR_SHOT = "TAR_SHOT",
 }
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@ -391,8 +391,8 @@ export class Arena {
    return true;
  }

-  isMoveWeatherCancelled(move: Move) {
-    return this.weather && !this.weather.isEffectSuppressed(this.scene) && this.weather.isMoveWeatherCancelled(move);
+  isMoveWeatherCancelled(user: Pokemon, move: Move) {
+    return this.weather && !this.weather.isEffectSuppressed(this.scene) && this.weather.isMoveWeatherCancelled(user, move);
  }

  isMoveTerrainCancelled(user: Pokemon, targets: BattlerIndex[], move: Move) {
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@ -17,7 +17,7 @@ import { initMoveAnim, loadMoveAnimAssets } from "../data/battle-anims";
 import { Status, StatusEffect, getRandomStatus } from "../data/status-effect";
 import { pokemonEvolutions, pokemonPrevolutions, SpeciesFormEvolution, SpeciesEvolutionCondition, FusionSpeciesFormEvolution } from "../data/pokemon-evolutions";
 import { reverseCompatibleTms, tmSpecies, tmPoolTiers } from "../data/tms";
-import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag } from "../data/battler-tags";
+import { BattlerTag, BattlerTagLapseType, EncoreTag, GroundedTag, HighestStatBoostTag, TypeImmuneTag, getBattlerTag, SemiInvulnerableTag, TypeBoostTag, MoveRestrictionBattlerTag, ExposedTag, DragonCheerTag, CritBoostTag, TrappedTag, TarShotTag } from "../data/battler-tags";
 import { WeatherType } from "../data/weather";
 import { ArenaTagSide, NoCritTag, WeakenMoveScreenTag } from "../data/arena-tag";
 import { Ability, AbAttr, StatMultiplierAbAttr, BlockCritAbAttr, BonusCritAbAttr, BypassBurnDamageReductionAbAttr, FieldPriorityMoveImmunityAbAttr, IgnoreOpponentStatStagesAbAttr, MoveImmunityAbAttr, PreDefendFullHpEndureAbAttr, ReceivedMoveDamageMultiplierAbAttr, ReduceStatusEffectDurationAbAttr, 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 } from "../data/ability";
@ -58,6 +58,7 @@ 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 { PLAYER_PARTY_MAX_SIZE } from "#app/constants";

 export enum FieldPosition {
  CENTER,
@ -983,10 +984,16 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      : this.moveset;

    // Overrides moveset based on arrays specified in overrides.ts
-    const overrideArray: 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];
+    }
    if (overrideArray.length > 0) {
+      if (!this.isPlayer()) {
+        this.moveset = [];
+      }
      overrideArray.forEach((move: Moves, index: number) => {
-        const ppUsed = this.moveset[index]?.ppUsed || 0;
+        const ppUsed = this.moveset[index]?.ppUsed ?? 0;
        this.moveset[index] = new PokemonMove(move, Math.min(ppUsed, allMoves[move].pp));
      });
    }
@ -1049,6 +1056,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      const teraType = this.getTeraType();
      if (teraType !== Type.UNKNOWN) {
        types.push(teraType);
+        if (forDefend) {
+          return types;
+        }
      }
    }

@ -1320,9 +1330,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    }

    const trappedByAbility = new Utils.BooleanHolder(false);
+    const opposingField = this.isPlayer() ? this.scene.getEnemyField() : this.scene.getPlayerField();

-    this.scene.getEnemyField()!.forEach(enemyPokemon =>
-      applyCheckTrappedAbAttrs(CheckTrappedAbAttr, enemyPokemon, trappedByAbility, this, trappedAbMessages, simulated)
+    opposingField.forEach(opponent =>
+      applyCheckTrappedAbAttrs(CheckTrappedAbAttr, opponent, trappedByAbility, this, trappedAbMessages, simulated)
    );

    return (trappedByAbility.value || !!this.getTag(TrappedTag));
@ -1348,7 +1359,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {

  /**
   * Calculates the effectiveness of a move against the Pokémon.
-   *
+   * This includes modifiers from move and ability attributes.
   * @param source {@linkcode Pokemon} The attacking Pokémon.
   * @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`).
@ -1368,10 +1379,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      : 1);

    applyMoveAttrs(VariableMoveTypeMultiplierAttr, source, this, move, typeMultiplier);
-    if (this.getTypes().find(t => move.isTypeImmune(source, this, t))) {
+    if (this.getTypes(true, true).find(t => move.isTypeImmune(source, this, t))) {
      typeMultiplier.value = 0;
    }

+    if (this.getTag(TarShotTag) && (this.getMoveType(move) === Type.FIRE)) {
+      typeMultiplier.value *= 2;
+    }
+
    const cancelledHolder = cancelled ?? new Utils.BooleanHolder(false);
    if (!ignoreAbility) {
      applyPreDefendAbAttrs(TypeImmunityAbAttr, this, source, move, cancelledHolder, simulated, typeMultiplier);
@ -1403,7 +1418,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
  }

  /**
-   * Calculates the type effectiveness multiplier for an attack type
+   * 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 source {@linkcode Pokemon} the Pokemon using the move
   * @param ignoreStrongWinds whether or not this ignores strong winds (anticipation, forewarn, stealth rocks)
@ -2775,7 +2790,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
      return this.fusionFaintCry(callback);
    }

-    const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`;
+    const key = `cry/${this.species.getCryKey(this.formIndex)}`;
    //eslint-disable-next-line @typescript-eslint/no-unused-vars
    let i = 0;
    let rate = 0.85;
@ -2833,7 +2848,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
  }

  private fusionFaintCry(callback: Function): void {
-    const key = `cry/${this.getSpeciesForm().getCryKey(this.formIndex)}`;
+    const key = `cry/${this.species.getCryKey(this.formIndex)}`;
    let i = 0;
    let rate = 0.85;
    const cry = this.scene.playSound(key, { rate: rate }) as AnySound;
@ -2841,7 +2856,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
    const tintSprite = this.getTintSprite();
    let duration = cry.totalDuration * 1000;

-    const fusionCryKey = `cry/${this.getFusionSpeciesForm().getCryKey(this.fusionFormIndex)}`;
+    const fusionCryKey = `cry/${this.fusionSpecies?.getCryKey(this.fusionFormIndex)}`;
    let fusionCry = this.scene.playSound(fusionCryKey, { rate: rate }) as AnySound;
    fusionCry.stop();
    duration = Math.min(duration, fusionCry.totalDuration * 1000);
@ -3528,7 +3543,6 @@ export default interface Pokemon {

 export class PlayerPokemon extends Pokemon {
  public compatibleTms: Moves[];
-  public usedTms: Moves[];

  constructor(scene: BattleScene, species: PokemonSpecies, level: integer, abilityIndex?: integer, formIndex?: integer, gender?: Gender, shiny?: boolean, variant?: Variant, ivs?: integer[], nature?: Nature, dataSource?: Pokemon | PokemonData) {
    super(scene, 106, 148, species, level, abilityIndex, formIndex, gender, shiny, variant, ivs, nature, dataSource);
@ -3552,7 +3566,6 @@ export class PlayerPokemon extends Pokemon {
      }
    }
    this.generateCompatibleTms();
-    this.usedTms = [];
  }

  initBattleInfo(): void {
@ -4462,17 +4475,29 @@ export class EnemyPokemon extends Pokemon {
    return BattlerIndex.ENEMY + this.getFieldIndex();
  }

-  addToParty(pokeballType: PokeballType) {
+  /**
+   * Add a new pokemon to the player's party (at `slotIndex` if set).
+   * @param pokeballType the type of pokeball the pokemon was caught with
+   * @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) {
    const party = this.scene.getParty();
    let ret: PlayerPokemon | null = null;

-    if (party.length < 6) {
+    if (party.length < PLAYER_PARTY_MAX_SIZE) {
      this.pokeball = pokeballType;
      this.metLevel = this.level;
      this.metBiome = this.scene.arena.biomeType;
      this.metSpecies = this.species.speciesId;
      const newPokemon = this.scene.addPlayerPokemon(this.species, this.level, this.abilityIndex, this.formIndex, this.gender, this.shiny, this.variant, this.ivs, this.nature, this);
-      party.push(newPokemon);
+
+      if (Utils.isBetween(slotIndex, 0, PLAYER_PARTY_MAX_SIZE - 1)) {
+        party.splice(slotIndex, 0, newPokemon);
+      } else {
+        party.push(newPokemon);
+      }
+
      ret = newPokemon;
      this.scene.triggerPokemonFormChange(newPokemon, SpeciesFormChangeActiveTrigger, true);
    }
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@ -357,7 +357,7 @@ export default class Trainer extends Phaser.GameObjects.Container {

      // 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(Math.random() * newSpeciesPool.length)])
+        ? getPokemonSpecies(newSpeciesPool[Math.floor(Utils.randSeedInt(newSpeciesPool.length))])
        : template.isSameSpecies(index) && index > offset
          ? getPokemonSpecies(battle.enemyParty[offset].species.getTrainerSpeciesForLevel(level, false, template.getStrength(offset), this.scene.currentBattle.waveIndex))
          : this.genNewPartyMemberSpecies(level, strength);
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@ -7,15 +7,15 @@ import { WindowVariant, getWindowVariantSuffix } from "./ui/ui-theme";
 import { isMobile } from "./touch-controls";
 import * as Utils from "./utils";
 import { initI18n } from "./plugins/i18n";
-import {initPokemonPrevolutions} from "#app/data/pokemon-evolutions";
-import {initBiomes} from "#app/data/biomes";
-import {initEggMoves} from "#app/data/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 {initAchievements} from "#app/system/achv";
-import {initTrainerTypeDialogue} from "#app/data/dialogue";
+import { initPokemonPrevolutions } from "#app/data/pokemon-evolutions";
+import { initBiomes } from "#app/data/biomes";
+import { initEggMoves } from "#app/data/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 { initAchievements } from "#app/system/achv";
+import { initTrainerTypeDialogue } from "#app/data/dialogue";
 import { initChallenges } from "./data/challenge";
 import i18next from "i18next";
 import { initStatsKeys } from "./ui/game-stats-ui-handler";
@ -250,9 +250,9 @@ export class LoadingScene extends SceneBase {
    }
    const availableLangs = ["en", "de", "it", "fr", "ja", "ko", "es", "pt-BR", "zh-CN"];
    if (lang && availableLangs.includes(lang)) {
-      this.loadImage("september-update-"+lang, "events");
+      this.loadImage("egg-update_"+lang, "events");
    } else {
-      this.loadImage("september-update-en", "events");
+      this.loadImage("egg-update_en", "events");
    }

    this.loadAtlas("statuses", "");
--- a/src/locales/de/battler-tags.json
+++ b/src/locales/de/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}} wurde durch den Fluch verletzt!",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}} hortet {{stockpiledCount}}!",
  "disabledOnAdd": " {{moveName}} von {{pokemonNameWithAffix}} wurde blockiert!",
-  "disabledLapse": "{{moveName}} von {{pokemonNameWithAffix}} ist nicht länger blockiert!"
+  "disabledLapse": "{{moveName}} von {{pokemonNameWithAffix}} ist nicht länger blockiert!",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}} ist nun schwach gegenüber Feuer-Attacken!"
 }
--- a/src/locales/de/fight-ui-handler.json
+++ b/src/locales/de/fight-ui-handler.json
@ -3,5 +3,6 @@
  "power": "Stärke",
  "accuracy": "Genauigkeit",
  "abilityFlyInText": "{{passive}}{{abilityName}} von {{pokemonName}} wirkt!",
-  "passive": "Passive Fähigkeit "
+  "passive": "Passive Fähigkeit ",
+  "teraHover": "Tera-Typ {{type}}"
 }
--- a/src/locales/de/move-trigger.json
+++ b/src/locales/de/move-trigger.json
@ -66,5 +66,6 @@
  "revivalBlessing": "{{pokemonName}} ist wieder fit und kampfbereit!",
  "swapArenaTags": "{{pokemonName}} hat die Effekte, die auf den beiden Seiten des Kampffeldes wirken, miteinander getauscht!",
  "exposedMove": "{{pokemonName}} erkennt {{targetPokemonName}}!",
-  "safeguard": "{{targetName}} wird durch Bodyguard geschützt!"
+  "safeguard": "{{targetName}} wird durch Bodyguard geschützt!",
+  "afterYou": "{{targetName}} lässt sich auf Galanterie ein!"
 }
--- a/src/locales/en/battle.json
+++ b/src/locales/en/battle.json
@ -44,7 +44,10 @@
  "moveNotImplemented": "{{moveName}} is not yet implemented and cannot be selected.",
  "moveNoPP": "There's no PP left for\nthis move!",
  "moveDisabled": "{{moveName}} is disabled!",
+  "canOnlyUseMove": "{{pokemonName}} can only use {{moveName}}!",
+  "moveCannotBeSelected": "{{moveName}} cannot be selected!",
  "disableInterruptedMove": "{{pokemonNameWithAffix}}'s {{moveName}}\nis disabled!",
+  "throatChopInterruptedMove": "The effects of Throat Chop prevent\n{{pokemonName}} from using certain moves!",
  "noPokeballForce": "An unseen force\nprevents using Poké Balls.",
  "noPokeballTrainer": "You can't catch\nanother trainer's Pokémon!",
  "noPokeballMulti": "You can only throw a Poké Ball\nwhen there is one Pokémon remaining!",
--- a/src/locales/en/battler-tags.json
+++ b/src/locales/en/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}} is afflicted by the Curse!",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}} stockpiled {{stockpiledCount}}!",
  "disabledOnAdd": "{{pokemonNameWithAffix}}'s {{moveName}}\nwas disabled!",
-  "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled."
+  "disabledLapse": "{{pokemonNameWithAffix}}'s {{moveName}}\nis no longer disabled.",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}} became weaker to fire!"
 }
--- a/src/locales/en/fight-ui-handler.json
+++ b/src/locales/en/fight-ui-handler.json
@ -2,6 +2,7 @@
  "pp": "PP",
  "power": "Power",
  "accuracy": "Accuracy",
-  "abilityFlyInText": " {{pokemonName}}'s {{passive}}{{abilityName}}",
-  "passive": "Passive "
-}
+  "abilityFlyInText": " {{pokemonName}}’s\n{{passive}}{{abilityName}}",
+  "passive": "Passive ",
+  "teraHover": "{{type}} Terastallized"
+}
--- a/src/locales/en/move-trigger.json
+++ b/src/locales/en/move-trigger.json
@ -7,6 +7,7 @@
  "switchedStat": "{{pokemonName}} switched {{stat}} with its target!",
  "sharedGuard": "{{pokemonName}} shared its guard with the target!",
  "sharedPower": "{{pokemonName}} shared its power with the target!",
+  "shiftedStats": "{{pokemonName}} switched its {{statToSwitch}} and {{statToSwitchWith}}!",
  "goingAllOutForAttack": "{{pokemonName}} is going all out for this attack!",
  "regainedHealth": "{{pokemonName}} regained\nhealth!",
  "keptGoingAndCrashed": "{{pokemonName}} kept going\nand crashed!",
@ -66,5 +67,6 @@
  "revivalBlessing": "{{pokemonName}} was revived!",
  "swapArenaTags": "{{pokemonName}} swapped the battle effects affecting each side of the field!",
  "exposedMove": "{{pokemonName}} identified\n{{targetPokemonName}}!",
-  "safeguard": "{{targetName}} is protected by Safeguard!"
-}
+  "safeguard": "{{targetName}} is protected by Safeguard!",
+  "afterYou": "{{pokemonName}} took the kind offer!"
+}
--- a/src/locales/es/battler-tags.json
+++ b/src/locales/es/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "¡{{pokemonNameWithAffix}} es víctima de una maldición!",
  "stockpilingOnAdd": "¡{{pokemonNameWithAffix}} ha reservado energía por {{stockpiledCount}}ª vez!",
  "disabledOnAdd": "¡Se ha anulado el movimiento {{moveName}}\nde {{pokemonNameWithAffix}}!",
-  "disabledLapse": "¡El movimiento {{moveName}} de {{pokemonNameWithAffix}} \n ya no está anulado!"
+  "disabledLapse": "¡El movimiento {{moveName}} de {{pokemonNameWithAffix}} ya no está anulado!",
+  "tarShotOnAdd": "¡{{pokemonNameWithAffix}} se ha vuelto débil ante el fuego!"
 }
--- a/src/locales/es/fight-ui-handler.json
+++ b/src/locales/es/fight-ui-handler.json
@ -3,5 +3,6 @@
  "power": "Potencia",
  "accuracy": "Precisión",
  "abilityFlyInText": " {{passive}}{{pokemonName}}\n{{abilityName}}",
-  "passive": "Pasiva de "
+  "passive": "Pasiva de ",
+  "teraHover": "Tera-tipo {{type}}"
 }
--- a/src/locales/es/move-trigger.json
+++ b/src/locales/es/move-trigger.json
@ -12,5 +12,6 @@
  "stoleItem": "¡{{pokemonName}} robó el objeto\n{{itemName}} de {{targetName}}!",
  "statEliminated": "¡Los cambios en estadísticas fueron eliminados!",
  "revivalBlessing": "¡{{pokemonName}} ha revivido!",
-  "safeguard": "¡{{targetName}} está protegido por Velo Sagrado!"
+  "safeguard": "¡{{targetName}} está protegido por Velo Sagrado!",
+  "afterYou": "¡{{pokemonName}} ha decidido aprovechar la oportunidad!"
 }
--- a/src/locales/fr/battler-tags.json
+++ b/src/locales/fr/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}} est touché par la malédiction !",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}} utilise\nla capacité Stockage {{stockpiledCount}} fois !",
  "disabledOnAdd": "La capacité {{moveName}}\nde {{pokemonNameWithAffix}} est mise sous entrave !",
-  "disabledLapse": "La capacité {{moveName}}\nde {{pokemonNameWithAffix}} n’est plus sous entrave !"
+  "disabledLapse": "La capacité {{moveName}}\nde {{pokemonNameWithAffix}} n’est plus sous entrave !",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}} est maintenant\nvulnérable au feu !"
 }
--- a/src/locales/fr/berry.json
+++ b/src/locales/fr/berry.json
@ -1,46 +1,46 @@
 {
  "SITRUS": {
    "name": "Baie Sitrus",
-    "effect": "Restaure 25% des PV s’ils sont inférieurs à 50%."
+    "effect": "Restaure 25% des PV du porteur s’ils sont inférieurs à 50%."
  },
  "LUM": {
    "name": "Baie Prine",
-    "effect": "Soigne tout problème de statut permanant et la confusion."
+    "effect": "Soigne tout problème de statut et la confusion du porteur."
  },
  "ENIGMA": {
    "name": "Baie Enigma",
-    "effect": "Restaure 25% des PV si touché par une capacité super efficace."
+    "effect": "Restaure 25% des PV du porteur s’il est touché par une capacité super efficace."
  },
  "LIECHI": {
    "name": "Baie Lichii",
-    "effect": "Augmente l’Attaque si les PV sont inférieurs à 25%."
+    "effect": "Augmente l’Attaque du porteur si ses PV sont inférieurs à 25%."
  },
  "GANLON": {
    "name": "Baie Lingan",
-    "effect": "Augmente la Défense si les PV sont inférieurs à 25%."
+    "effect": "Augmente la Défense du porteur si ses PV sont inférieurs à 25%."
  },
  "PETAYA": {
    "name": "Baie Pitaye",
-    "effect": "Augmente l’Atq. Spé. si les PV sont inférieurs à 25%."
+    "effect": "Augmente l’Atq. Spé. du porteur si ses PV sont inférieurs à 25%."
  },
  "APICOT": {
    "name": "Baie Abriko",
-    "effect": "Augmente la Déf. Spé. si les PV sont inférieurs à 25%."
+    "effect": "Augmente la Déf. Spé. du porteur si ses PV sont inférieurs à 25%."
  },
  "SALAC": {
    "name": "Baie Sailak",
-    "effect": "Augmente la Vitesse si les PV sont inférieurs à 25%."
+    "effect": "Augmente la Vitesse du porteur si ses PV sont inférieurs à 25%."
  },
  "LANSAT": {
    "name": "Baie Lansat",
-    "effect": "Augmente le taux de coups critiques si les PV sont inférieurs à 25%."
+    "effect": "Augmente le taux de coups critiques du porteur si ses PV sont inférieurs à 25%."
  },
  "STARF": {
    "name": "Baie Frista",
-    "effect": "Augmente énormément une statistique au hasard si les PV sont inférieurs à 25%."
+    "effect": "Augmente énormément une statistique au hasard du porteur si ses PV sont inférieurs à 25%."
  },
  "LEPPA": {
    "name": "Baie Mepo",
-    "effect": "Restaure 10 PP à une capacité dès que ses PP tombent à 0."
+    "effect": "Restaure 10 PP à une capacité du porteur dès que ses PP tombent à 0."
  }
-}
+}
--- a/src/locales/fr/dialogue.json
+++ b/src/locales/fr/dialogue.json
@ -54,8 +54,8 @@
      "3": "J’espère que j’aurai ma revanche un jour.",
      "4": "C’était super amusant ! Mais ce combat m’a épuisée…",
      "5": "Tu m’as appris une belle leçon ! T’es vraiment incroyable !",
-      "6": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais tu es vraiment très cool.",
-      "6_female": "Vraiment ? J’ai perdu… ? C’est des choses qui arrivent, ça me déprime mais t’es vraiment très cool.",
+      "6": "Vraiment ? J’ai perdu… ? Bon, ça arrive, mais c’était cool quand même.",
+      "6_female": "Vraiment ? J’ai perdu… ? Bon, ça arrive, mais c’était cool quand même.",
      "7": "J’ai pas besoin de ce genre de souvenirs.\n*Suppression de mémoire en cours…*",
      "8": "Hé ! Je t’avais dit d’y aller doucement avec moi ! Mais t’es vraiment si cool quand tu te bats sérieusement…",
      "9": "J’en ai marre des combats Pokémon…\nJe vais chercher d’autres trucs à faire…"
@ -314,8 +314,8 @@
      "3": "On est juste des gars et des meufs normaux, on voit un Pokémon on le prend !",
      "4": "Pourquoi tu te la joue comme ça ? C'est avec tes dents que t’vas jouer frérot.",
      "4_female": "Pourquoi tu te la joue comme ça ? C'est avec tes dents que t’vas jouer ma reus.",
-      "5": "Cousin, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\n$Mais on est sympa, on a un plan pour toi ! ♪",
-      "5_female": "Cousine, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\n$Mais on est sympa, on a un plan pour toi ! ♪"
+      "5": "Cousin, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\nMais on est sympa, on a un plan pour toi ! ♪",
+      "5_female": "Cousine, écoute-nous bien ! ♪\nSe taper dessus, ça sert à rien ! ♪\n$Tu t’incrustes chez nous, ça s’fait pas ! ♪\nMais on est sympa, on a un plan pour toi ! ♪"
    },
    "victory": {
      "1": "Hein ? C’est déjà terminé ?",
@ -687,7 +687,7 @@
  },
  "rival_6": {
    "encounter": {
-      "1": "@c{smile_eclosed}Nous y revoilà.\n$@c{neutral}J’ai eu du temps pour réfléchir à tout ça.\nIl y a une raison à pourquoi tout semble étrange.\n$@c{neutral_eclosed}Ton rêve, ma volonté de te battre…\nFont partie de quelque chose de plus grand.\n$@c{serious}C’est même pas à propos de moi, ni de toi… Mais du monde, @c{serious_mhalf_fists}et te repousser dans tes limites est ma mission.\n$@c{neutral_eclosed}J’ignore si je serai capable de l’accomplir, mais je ferai tout ce qui est en mon pouvoir.\n$@c{neutral}Cet endroit est terrifiant… Et pourtant il m’a l’air familier, comme si j’y avais déjà mis les pieds.\n$@c{serious_mhalf_fists}Tu ressens la même chose, pas vrai ?\n$@c{serious}… et c’est comme si quelque chose ici me parlait.\n$Comme si c’était tout ce que ce monde avait toujours connu.\n$Ces précieux moments ensemble semblent si proches ne sont rien de plus qu’un lointain souvenir.\n$@c{neutral_eclosed}D’ailleurs, qui peut dire aujourd’hui qu’ils ont pu être réels ?\n$@c{serious_mopen_fists}Il faut que tu persévères. Si tu t’arrêtes, ça n’aura jamais de fin et t’es la seule à en être capable.\n$@c{serious_smile_fists}Difficile de comprendre le sens de tout ça, je sais juste que c’est la réalité.\n$@c{serious_mopen_fists}Si tu ne parviens pas à me battre ici et maintenant, tu n’as aucune chance."
+      "1": "@c{smile_eclosed}Nous y revoilà.\n$@c{neutral}J’ai eu du temps pour réfléchir à tout ça.\nIl y a une raison à pourquoi tout semble étrange.\n$@c{neutral_eclosed}Ton rêve, ma volonté de te battre…\nFont partie de quelque chose de plus grand.\n$@c{serious}C’est même pas à propos de moi, ni de toi… Mais du monde, @c{serious_mhalf_fists}et te repousser dans tes limites est ma mission.\n$@c{neutral_eclosed}J’ignore si je serai capable de l’accomplir, mais je ferai tout ce qui est en mon pouvoir.\n$@c{neutral}Cet endroit est terrifiant… Et pourtant il m’a l’air familier, comme si j’y avais déjà mis les pieds.\n$@c{serious_mhalf_fists}Tu ressens la même chose, pas vrai ?\n$@c{serious}… et c’est comme si quelque chose ici me parlait.\n$Comme si c’était tout ce que ce monde avait toujours connu.\n$Ces précieux moments ensemble qui semblent si proches ne sont rien de plus qu’un lointain souvenir.\n$@c{neutral_eclosed}D’ailleurs, qui peut dire aujourd’hui qu’ils ont pu être réels ?\n$@c{serious_mopen_fists}Il faut que tu persévères. Si tu t’arrêtes, ça n’aura jamais de fin et t’es la seule à en être capable.\n$@c{serious_smile_fists}Difficile de comprendre le sens de tout ça, je sais juste que c’est la réalité.\n$@c{serious_mopen_fists}Si tu ne parviens pas à me battre ici et maintenant, tu n’as aucune chance."
    },
    "victory": {
      "1": "@c{smile_eclosed}J’ai fait ce que j’avais à faire.\n$Promets-moi juste une chose.\n@c{smile}Après avoir réparé ce monde… Rentre à la maison."
--- a/src/locales/fr/fight-ui-handler.json
+++ b/src/locales/fr/fight-ui-handler.json
@ -3,5 +3,6 @@
  "power": "Puissance",
  "accuracy": "Précision",
  "abilityFlyInText": " {{passive}}{{abilityName}}\nde {{pokemonName}}",
-  "passive": "Passif "
-}
+  "passive": "Passif ",
+  "teraHover": "Téracristal {{type}}"
+}
--- a/src/locales/fr/modifier-type.json
+++ b/src/locales/fr/modifier-type.json
@ -202,7 +202,7 @@
    "GOLDEN_PUNCH": { "name": "Poing Doré", "description": "La moitié des dégâts infligés sont convertis en argent." },
    "COIN_CASE": { "name": "Boite Jetons", "description": "Tous les 10 combats, recevez 10% de votre argent en intérêts." },

-    "LOCK_CAPSULE": { "name": "Poké Écrin", "description": "Permet de conserver la rareté des objets si vous relancez les objets proposés." },
+    "LOCK_CAPSULE": { "name": "Poké Écrin", "description": "Permet de choisir de bloquer le niveau de rareté lors d’une relance des objets gratuits proposés." },

    "GRIP_CLAW": { "name": "Accro Griffe" },
    "WIDE_LENS": { "name": "Loupe" },
--- a/src/locales/fr/move-trigger.json
+++ b/src/locales/fr/move-trigger.json
@ -1,9 +1,9 @@
 {
  "hitWithRecoil": "{{pokemonName}} est blessé par le contrecoup !",
-  "cutHpPowerUpMove": "{{pokemonName}} sacrifie des PV\net augmente la puissance ses capacités !",
+  "cutHpPowerUpMove": "{{pokemonName}} sacrifie des PV\net augmente la puissance de ses capacités !",
  "absorbedElectricity": "{{pokemonName}} absorbe de l’électricité !",
  "switchedStatChanges": "{{pokemonName}} permute\nles changements de stats avec ceux de sa cible !",
-  "switchedTwoStatChanges": "{{pokemonName}} permute les changements de {{firstStat} et de {{secondStat}} avec ceux de sa cible !",
+  "switchedTwoStatChanges": "{{pokemonName}} permute les changements de {{firstStat}} et de {{secondStat}} avec ceux de sa cible !",
  "switchedStat": "{{pokemonName}} et sa cible échangent leur {{stat}} !",
  "sharedGuard": "{{pokemonName}} additionne sa garde à celle de sa cible et redistribue le tout équitablement !",
  "sharedPower": "{{pokemonName}} additionne sa force à celle de sa cible et redistribue le tout équitablement !",
@ -66,5 +66,6 @@
  "revivalBlessing": "{{pokemonName}} a repris connaissance\net est prêt à se battre de nouveau !",
  "swapArenaTags": "Les effets affectant chaque côté du terrain\nont été échangés par {{pokemonName}} !",
  "exposedMove": "{{targetPokemonName}} est identifié\npar {{pokemonName}} !",
-  "safeguard": "{{targetName}} est protégé\npar la capacité Rune Protect !"
+  "safeguard": "{{targetName}} est protégé\npar la capacité Rune Protect !",
+  "afterYou": "{{pokemonName}} accepte\navec joie !"
 }
--- a/src/locales/fr/pokemon-info.json
+++ b/src/locales/fr/pokemon-info.json
@ -17,7 +17,7 @@
    "HPStat": "PV"
  },
  "Type": {
-    "UNKNOWN": "Inconnu",
+    "UNKNOWN": "???",
    "NORMAL": "Normal",
    "FIGHTING": "Combat",
    "FLYING": "Vol",
--- a/src/locales/it/battler-tags.json
+++ b/src/locales/it/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}} subisce la maledizione!",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}} ha usato Accumulo per la\n{{stockpiledCount}}ª volta!",
  "disabledOnAdd": "La mossa {{moveName}} di\n{{pokemonNameWithAffix}} è stata bloccata!",
-  "disabledLapse": "La mossa {{moveName}} di\n{{pokemonNameWithAffix}} non è più bloccata!"
+  "disabledLapse": "La mossa {{moveName}} di\n{{pokemonNameWithAffix}} non è più bloccata!",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}} è diventato vulnerabile\nal tipo Fuoco!"
 }
--- a/src/locales/it/fight-ui-handler.json
+++ b/src/locales/it/fight-ui-handler.json
@ -2,6 +2,7 @@
  "pp": "PP",
  "power": "Potenza",
  "accuracy": "Precisione",
-  "abilityFlyInText": "{{passive}} {{pokemonName}} {{abilityName}}",
-  "passive": "Passiva di "
-}
+  "abilityFlyInText": "{{passive}}{{pokemonName}}\n{{abilityName}}",
+  "passive": "Passiva di ",
+  "teraHover": "Teracristallizzato {{type}}"
+}
--- a/src/locales/it/move-trigger.json
+++ b/src/locales/it/move-trigger.json
@ -66,5 +66,6 @@
  "revivalBlessing": "{{pokemonName}} torna in forze!",
  "swapArenaTags": "{{pokemonName}} ha invertito gli effetti attivi\nnelle due metà del campo!",
  "exposedMove": "{{pokemonName}} ha identificato\n{{targetPokemonName}}!",
-  "safeguard": "Salvaguardia protegge {{targetName}}!"
-}
+  "safeguard": "Salvaguardia protegge {{targetName}}!",
+  "afterYou": "{{pokemonName}} approfitta della cortesia!"
+}
--- a/src/locales/ja/ability-trigger.json
+++ b/src/locales/ja/ability-trigger.json
@ -2,11 +2,11 @@
  "blockRecoilDamage": "{{pokemonName}}は　{{abilityName}}で　反動ダメージを　受けない！",
  "badDreams": "{{pokemonName}}は　ナイトメアに うなされている！",
  "costar": "{{pokemonName}}は　{{allyName}}の\n能力変化を　コピーした！",
-  "iceFaceAvoidedDamage": "{{pokemonName}}は\n{{abilityName}}で　ダメージを　受けない！",
+  "iceFaceAvoidedDamage": "{{pokemonNameWithAffix}}は\n{{abilityName}}で　ダメージを　受けない！",
  "perishBody": "{{pokemonName}}の {{abilityName}}で\nおたがいは　3ターン後に　ほろびいてしまう！",
  "poisonHeal": "{{pokemonName}}は　{{abilityName}}で　回復した！",
  "trace": "{{pokemonName}}は　相手の　{{targetName}}の\n{{abilityName}}を　トレースした！",
-  "windPowerCharged": "{{pokemonName}}は\n{{moveName}}を　受けて　じゅうでんした！",
+  "windPowerCharged": "{{pokemonNameWithAffix}}は\n{{moveName}}を　受けて　じゅうでんした！",
  "quickDraw": "{{pokemonName}}は　クイックドロウで\n行動が　はやくなった！",
  "disguiseAvoidedDamage": "{{pokemonNameWithAffix}}の\nばけのかわが　はがれた！",
  "blockItemTheft": "{{pokemonNameWithAffix}}の　{{abilityName}}で\n道具を　うばわれない！",
--- a/src/locales/ja/ability.json
+++ b/src/locales/ja/ability.json
--- a/src/locales/ja/arena-flyout.json
+++ b/src/locales/ja/arena-flyout.json
@ -39,5 +39,6 @@
  "matBlock": "たたみがえし",
  "craftyShield": "トリックガード",
  "tailwind": "おいかぜ",
-  "happyHour": "ハッピータイム"
+  "happyHour": "ハッピータイム",
+  "safeguard": "しんぴなまもり"
 }
--- a/src/locales/ja/arena-tag.json
+++ b/src/locales/ja/arena-tag.json
@ -47,5 +47,11 @@
  "tailwindOnRemovePlayer": "味方の　追い風が　止んだ！",
  "tailwindOnRemoveEnemy": "相手の　追い風が　止んだ！",
  "happyHourOnAdd": "みんなが　ハッピーな気分に\n包まれた！",
-  "happyHourOnRemove": "みんなの　気分が　元に戻った"
-}
+  "happyHourOnRemove": "みんなの　気分が　元に戻った",
+  "safeguardOnAdd": "場の全体は　神秘のベールに　包まれた！",
+  "safeguardOnAddPlayer": "味方は　神秘のベールに　包まれた！",
+  "safeguardOnAddEnemy": "相手は　神秘のベールに　包まれた！",
+  "safeguardOnRemove": "場の全体を　包んでいた\n神秘のベールが　なくなった！",
+  "safeguardOnRemovePlayer": "味方を　包んでいた\n神秘のベールが　なくなった！",
+  "safeguardOnRemoveEnemy": "相手を　包んでいた\n神秘のベールが　なくなった！"
+}
--- a/src/locales/ja/battle.json
+++ b/src/locales/ja/battle.json
@ -4,7 +4,7 @@
  "trainerAppearedDouble": "{{trainerName}}が\n勝負を しかけてきた！",
  "trainerSendOut": "{{trainerName}}は\n{{pokemonName}}を　繰り出した！",
  "singleWildAppeared": "あっ！　野生の　{{pokemonName}}が　飛び出してきた！",
-  "multiWildAppeared": "あっ！　野生の {{pokemonName1}}と\n{{pokemonName2}}が 飛び出してきた！",
+  "multiWildAppeared": "あっ！　野生の {{pokemonName1}}と\n{{pokemonName2}}が　飛び出してきた！",
  "playerComeBack": "{{pokemonName}}!　戻れ！",
  "trainerComeBack": "{{trainerName}}は\n{{pokemonName}}を 引っ込めた！",
  "playerGo": "ゆけっ！ {{pokemonName}}！",
@ -51,7 +51,7 @@
  "noPokeballStrong": "相手の　ポケモンが　強すぎて　捕まえられない！\nまずは　弱めよう！",
  "noEscapeForce": "見えない　力の　せいで\n逃げることが できない！",
  "noEscapeTrainer": "ダメだ！　勝負の最中に\n相手に　背中を　見せられない！",
-  "noEscapePokemon": "{{pokemonName}}の　{{moveName}}で　{{escapeVerb}}!",
+  "noEscapePokemon": "{{pokemonName}}の　{{moveName}}で\n{{escapeVerb}}!",
  "runAwaySuccess": " うまく　逃げ切れた！",
  "runAwayCannotEscape": "逃げることが　できない！",
  "escapeVerbSwitch": "入れ替えることが　できない",
@ -62,6 +62,7 @@
  "skipItemQuestion": "本当に　アイテムを　取らずに　進みますか？",
  "itemStackFull": "{{fullItemName}}の　スタックが　いっぱいです。\n代わりに　{{itemName}}を　取得します。",
  "eggHatching": "おや？",
+  "eggSkipPrompt": "タマゴは　ふかします！\nタマゴまとめに　飛ばしますか？",										  
  "ivScannerUseQuestion": "{{pokemonName}}を\n個体値スキャナーで　操作しますか?",
  "wildPokemonWithAffix": "野生の　{{pokemonName}}",
  "foePokemonWithAffix": "相手の　{{pokemonName}}",
--- a/src/locales/ja/battler-tags.json
+++ b/src/locales/ja/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}}は　のろわれている！",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}}は　{{stockpiledCount}}つ　たくわえた!",
  "disabledOnAdd": "{{pokemonNameWithAffix}}の\n{{moveName}}\nを　封じこめた！",
-  "disabledLapse": "{{pokemonNameWithAffix}}の\nかなしばりが　解けた！"
+  "disabledLapse": "{{pokemonNameWithAffix}}の\nかなしばりが　解けた！",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}}は　ほのおに　弱くなった！"
 }
--- a/src/locales/ja/berry.json
+++ b/src/locales/ja/berry.json
@ -1,46 +1,46 @@
 {
  "SITRUS": {
    "name": "オボンのみ",
-    "effect": "持たせると HPが 50％以下になるとき　HPを 25％ 回復する"
+    "effect": "持たせると　HPが　50%以下に　なるとき　HPを 25%　回復する"
  },
  "LUM": {
    "name": "ラムのみ",
-    "effect": "持たせると 状態異常や 混乱になるとき 回復する\n"
+    "effect": "持たせると　状態異常や　混乱に　なるとき　回復する"
  },
  "ENIGMA": {
    "name": "ナゾのみ",
-    "effect": "持たせると 効果バツグンの 技を 受けたとき HPを ２５％回復する"
+    "effect": "持たせると　効果バツグンの　技を　受けたとき　HPを　25%回復する"
  },
  "LIECHI": {
    "name": "チイラのみ",
-    "effect": "持たせると HPが 25%以下に なるとき 攻撃が あがる"
+    "effect": "持たせると　HPが　25%以下に　なるとき　攻撃が　あがる"
  },
  "GANLON": {
    "name": "リュガのみ",
-    "effect": "持たせると HPが 25%以下に なるとき 防御が あがる\n"
+    "effect": "持たせると　HPが　25%以下に　なるとき　防御が　あがる"
  },
  "PETAYA": {
    "name": "ヤタピのみ",
-    "effect": "持たせると HPが 25%以下に なるとき 特攻が あがる\n"
+    "effect": "持たせると　HPが　25%以下に　なるとき　特攻が　あがる"
  },
  "APICOT": {
    "name": "ズアのみ",
-    "effect": "持たせると HPが 25%以下に なるとき 特防が あがる\n"
+    "effect": "持たせると　HPが　25%以下に　なるとき　特防が　あがる"
  },
  "SALAC": {
    "name": "カムラのみ",
-    "effect": "持たせると HPが 25%以下に なるとき 素早さが あがる"
+    "effect": "持たせると　HPが　25%以下に　なるとき　素早さが　あがる"
  },
  "LANSAT": {
    "name": "サンのみ",
-    "effect": "持たせると HPが 25%以下に なるとき 攻撃が 急所に 当たりやすくなる"
+    "effect": "持たせると　HPが　25%以下に　なるとき　攻撃が　急所に　当たりやすくなる"
  },
  "STARF": {
    "name": "スターのみ",
-    "effect": "持たせると HPが 25%以下に なるとき どれか 1つの 能力が ぐーんと あがる"
+    "effect": "持たせると　HPが　25%以下に　なるとき　どれか　1つの　能力が　ぐーんと　あがる"
  },
  "LEPPA": {
    "name": "ヒメリのみ",
-    "effect": "持たせると PPが 0になる 技のPPを 10回復する"
+    "effect": "持たせると　PPが0になる　技の　PPを　10回復する"
  }
 }
--- a/src/locales/ja/fight-ui-handler.json
+++ b/src/locales/ja/fight-ui-handler.json
@ -2,6 +2,7 @@
  "pp": "PP",
  "power": "威力",
  "accuracy": "命中",
-  "abilityFlyInText": " {{pokemonName}}の\n{{passive}}：{{abilityName}}",
-  "passive": "パッシブ "
+  "abilityFlyInText": " {{pokemonName}}の\n{{passive}}{{abilityName}}",
+  "passive": "パッシブ ",
+  "teraHover": "{{type}}テラスタル"
 }
--- a/src/locales/ja/menu.json
+++ b/src/locales/ja/menu.json
@ -22,7 +22,7 @@
  "unmatchingPassword": "入力したパスワードが 一致しません",
  "passwordNotMatchingConfirmPassword": "パスワードは パスワード確認と 一致する 必要があります",
  "confirmPassword": "パスワード確認",
-  "registrationAgeWarning": "登録では １３歳以上 であることを 確認します。",
+  "registrationAgeWarning": "登録では 13歳以上 であることを 確認します。",
  "backToLogin": "ログインへ",
  "failedToLoadSaveData": "セーブデータの　読み込みは　不可能でした。ページを　再読み込み　してください。\n長い間に続く　場合は　管理者に　連絡してください。",
  "sessionSuccess": "セッションが　正常に　読み込まれました。",
@ -46,10 +46,10 @@
  "yes": "はい",
  "no": "いいえ",
  "disclaimer": "免責",
-  "disclaimerDescription": "このゲームは 未完成作品です。\nセーブデータの 損失を含める ゲーム性に関する 問題が 起きる可能性が あります。\nなお、ゲームは 予告なく変更される 可能性もあり、さらに更新され、完成されるとも 限りません。",
+  "disclaimerDescription": "このゲームは 未完成作品です。\nセーブデータの 損失を含める ゲーム性に関する 問題が 起きる可能性が あります。\nなお、ゲームは 予告なく変更される 可能性もあり、\nさらに更新され、完成されるとも 限りません。",
  "choosePokemon": "ポケモンを選ぶ",
  "renamePokemon": "ニックネームを変える",
-  "rename": "変える",
+  "rename": "名前を変える",
  "nickname": "ニックネーム",
  "errorServerDown": "おや！\nサーバーとの 接続中に 問題が 発生しました。\nゲームは 自動的に 再接続されます から\nウィンドウは 開いたままに しておいても よろしいです。",
  "noSaves": "何の　セーブファイルも　ありません！",
--- a/src/locales/ja/move-trigger.json
+++ b/src/locales/ja/move-trigger.json
@ -65,5 +65,6 @@
  "suppressAbilities": "{{pokemonName}}の　特性が　効かなくなった！",
  "revivalBlessing": "{{pokemonName}}は\n復活して　戦えるようになった！",
  "swapArenaTags": "{{pokemonName}}は\nお互いの　場の　効果を　入れ替えた！",
-  "exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を　見破った！"
+  "exposedMove": "{{pokemonName}}は {{targetPokemonName}}の\n正体を　見破った！",
+  "afterYou": "{{pokemonName}}は\nお言葉に　甘えることにした！"
 }
--- a/src/locales/ja/move.json
+++ b/src/locales/ja/move.json
--- a/src/locales/ja/party-ui-handler.json
+++ b/src/locales/ja/party-ui-handler.json
@ -4,5 +4,44 @@
  "CANCEL": "やめる",
  "RELEASE": "逃がす",
  "APPLY": "使う",
-  "TEACH": "教える"
+  "TEACH": "教える",
+  "SPLICE": "吸収合体",
+  "UNSPLICE": "合体を分離",
+  "ACTIVATE": "有効にする",
+  "DEACTIVATE": "無効にする",
+  "TRANSFER": "アイテムを移動",
+  "ALL": "全部",
+  "PASS_BATON": "バトンタッチ",
+  "UNPAUSE_EVOLUTION": "進化を有効にする",
+  "REVIVE": "復活する",
+  "RENAME": "名前を変える",
+  "choosePokemon": "ポケモンを　選んで　ください。",
+  "doWhatWithThisPokemon": "このポケモンを　どうする？",
+  "noEnergy": "{{pokemonName}}は　戦うための\n元気が　残っていません！",
+  "hasEnergy": "{{pokemonName}}は　まだまだ　元気だ！",
+  "cantBeUsed": "{{pokemonName}}は　このチャレンジで\n使えられません！",
+  "tooManyItems": "{{pokemonName}}は　このアイテムが\nこれ以上　持ちきれない！",
+  "anyEffect": "使っても　効果がないよ",
+  "unpausedEvolutions": "{{pokemonName}}は　また　進化できる。",
+  "unspliceConfirmation": "本当に　{{pokemonName}}を　{{fusionName}}から\n分離しますか？　{{fusionName}}は　なくなる。",
+  "wasReverted": "{{fusionName}}は　{{pokemonName}}に　回帰した。",
+  "releaseConfirmation": "本当に　{{pokemonName}}を　逃がしますか？",
+  "releaseInBattle": "戦闘中の　ポケモンを\n逃がすことは　できません！",
+  "selectAMove": "技を　選んでください。",
+  "changeQuantity": "移動する　アイテムを　選んでください。\n< と > で　数量が　変えられる。",
+  "selectAnotherPokemonToSplice": "もう一つの　ポケモンを　選んで　合体する。",
+  "cancel": "キャンセル",
+  "able": "可能",
+  "notAble": "不可能",
+  "learned": "覚えている",
+  "goodbye": "グッバイ　{{pokemonName}}!",
+  "byebye": "ばいばい　{{pokemonName}}!",
+  "farewell": "さようなら　{{pokemonName}}!",
+  "soLong": "じゃあね　{{pokemonName}}!",
+  "thisIsWhereWePart": "これでお別れだね　{{pokemonName}}!",
+  "illMissYou": "恋しく思うよ　{{pokemonName}}!",
+  "illNeverForgetYou": "一生忘れない　{{pokemonName}}!",
+  "untilWeMeetAgain": "また出会える日まで、{{pokemonName}}!",
+  "sayonara": "さらば　{{pokemonName}}!",
+  "smellYaLater": "そんじゃ　あばよ　{{pokemonName}}!"
 }
--- a/src/locales/ja/settings.json
+++ b/src/locales/ja/settings.json
@ -20,7 +20,7 @@
  "normal": "普通",
  "fast": "早い",
  "faster": "とても早い",
-  "skip": "スキップ",
+  "skip": "飛ばす",
  "levelUpNotifications": "レベルアップ時のみ",
  "on": "オン",
  "off": "オフ",
--- a/src/locales/ja/starter-select-ui-handler.json
+++ b/src/locales/ja/starter-select-ui-handler.json
@ -23,7 +23,7 @@
  "manageNature": "性格を変える",
  "addToFavorites": "お気に入りにする",
  "removeFromFavorites": "お気に入りから除く",
-  "useCandies": "飴を使う",
+  "useCandies": "アメを使う",
  "selectNature": "性格を選んでください。",
  "selectMoveSwapOut": "入れ替えたい技を選んでください。",
  "selectMoveSwapWith": "他の技と交換してください。",
--- a/src/locales/ja/tutorial.json
+++ b/src/locales/ja/tutorial.json
@ -1,10 +1,10 @@
 {
-  "intro": "PokéRogueへようこそ！ログライク要素が\n加わったバトル中心のポケモンファンゲームです。\n$このゲームは収益を上げず、Pokémonおよび使用される\n著作権資産に対する所有権を主張しません。\n$ゲームはまだ作業中ですが、完全にプレイすることができます。\nバグ報告はディスコードコミュニティをご利用ください。\n$ゲームが遅い場合は、ブラウザ設定で「ハードウェア\nアクセラレーション」がオンになっていることを確認してください",
-  "accessMenu": "メニューにアクセスするには、入力待ちの間にMキーまたはEscを押してください。\nメニューには設定やさまざまな機能が含まれています。",
-  "menu": "このメニューから設定にアクセスできます。\n$設定ではゲームスピード、ウィンドウスタイル、\nおよびその他のオプションを変更できます。\n$ここにはさまざまな他の機能もありますので、\nぜひ確認してみてください！",
-  "starterSelect": "この画面でZキーやSpaceを押してポケモンを選択できます。\n選んだポケモンは自分の最初のパーティーになります。\n$最大6匹のパーティーで始めることができますが\nポケモンによってポイントがあり、合計10を超えてはなりません。\n$捕まえたりふかさせたりすることで\n選択できる性別、特性、フォルムなどの幅を広げることができます。\n$個体値も徐々に累積して高くなるので、\n同じポケモンをたくさん捕まえてみてください！",
-  "pokerus": "毎日ランダムでスターターの\n3種類に紫色の枠が表示されます。\n$登録されたスターターの中にあれば、\nパーティに追加してつよさを確認してみましょう！",
-  "statChange": "ポケモンは交代しない限り、\n次のバトルでも能力変化が維持されます。\n$その代わりに、トレーナーバトルや新しいバイオームに\n入る直前に自動的にリセットされます。\n$CキーまたはShiftキーを押し続けると、\n現在のポケモンの能力変化を確認できます。\n$Vキーを押すと、\n相手が使用した技も確認できます。\n$ただし、今のバトルで相手ポケモンがすでに\n使った技のみが表示されます。",
-  "selectItem": "バトルが終わるたびに、\nランダムなアイテム3つの中から1つを選んで獲得します。\n$種類は消耗品、ポケモンの持ち物、\n永続的なパッシブアイテムなど様々です。\n$ほとんどの消耗しない道具は\n効果が累積されます。\n$進化用など一部のアイテムは\n使用できる場合にのみ登場します。\n$持ち物を渡す機能を使用して\nポケモン同士で道具を持たせることもできます。\n$持ち物があれば、アイテム選択画面の\n右下に渡す機能が表示されます。\n$お金で消耗品を購入することもでき、\nウェーブが進むにつれて購入可能な種類が増えます。\n$アイテムを選択すると次のウェーブに進むため、\nまず消耗品の購入を行ってください。",
-  "eggGacha": "この画面でポケモンのたまごクーポンを\nガチャができます。\n$卵は戦闘を繰り返すうちにふかします。\n珍しいほどもっと長くかかります。\n$ふかさせたポケモンはパーティーに追加されず、\nスターティングに登録されます。\n$卵からふかしたポケモンは一般的に\n野生で捕まえたポケモンよりも高い個体値を持ちます。\n$一部のポケモンは卵からしか手に入りません。\n$各ガチャマシンがそれぞれ異なるボーナスを持っているため、\n好きな方を使ってみてください!,"
-}
+  "intro": "PokéRogueへ　ようこそ！　ローグライク要素が\n加わった　バトル中心の　ポケモンファンゲームです。\n$このゲームは　収益を上げず、Pokémonおよび　使用される\n著作権資産に　対する所有権を　主張しません。\n$ゲームは　まだ開発中ですが、完全に　プレイすることが　できます。\nバグ報告は　ディスコードコミュニティを　ご利用ください。\n$ゲームが　遅い場合は、ブラウザ設定で「ハードウェア\nアクセラレーション」が　オンになっている　ことを　確認してください。",
+  "accessMenu": "メニューを開くには　入力待ちの間に　Mキー／Escを　押してください。\nメニューには　設定や　様々な機能が　含まれています。",
+  "menu": "このメニューから　設定が　開けます。\n$設定では、ゲームの速さや　ウィンドウタイプなどの　オプションを　変更できます。\n$ここには　様々な機能が　ありますので、\nぜひ　確認してみてください！",
+  "starterSelect": "この画面では　Zキー／空白キーを押して　ポケモンが　選択できます。\n選んだポケモンは　最初の手持ちに　なります。\n$各ポケモンは　ポイントが　ある。最大6つを　選べますが\nポケモンのポイントが　合計10を超えては　いけません。\n$ポケモンを　捕まえたり　タマゴからふかしたり　することで\n選択できる　性別、特性、フォルムなどの　幅を広げられます。\n$個体値も　徐々に　累積して　高くなるので、\n同じポケモンを　たくさん　捕まえて　みてください！",
+  "pokerus": "毎日、無作為に　スターターの\n3種類には　紫色の枠が　表示されます。\n$登録された　スターターの 中に　いれば、\n手持ちに加えて　強さを　確認してみましょう！",
+  "statChange": "ポケモンを　入れ替えない限り、\n次のバトルでも　能力変化は　なくなりません。\n$その代わりに、トレーナーバトルや　新しいバイオームに\n入る直前に　自動的に　能力変化は　元に戻ります。\n$Cキー／Shiftキーを　押し続けると、\n場にいるポケモンの　能力変化を　確認できます。\n$Vキーを押すと、\n相手が出した技も　確認できます。\n$ただし、現在のバトルでの　相手ポケモンが\nすでに使った　技のみが　表示されます。",
+  "selectItem": "バトルが　終わるたびには、「ショップ」という\n画面で　3つのご褒美から　1つが選べます。\n$種類は　消耗品、ポケモンの持ち物や道具、\n永続的な　パッシブアイテムなど　様々です。\n$ほとんどの　消耗しない　道具は\n効果が　累積されます。\n$例えば　進化アイテムなどの　ご褒美は\n使用できる　場合にのみ　登場します。\n$持ち物や道具が\n手持ちポケモン間に　移動できる\n$持ち物や道具が　あれば、ショップ画面の\n右下に「アイテム移行」が　表示されます。\n$ショップ画面で　お金で　消耗品を　買えます。\nラウンドが　進むにつれて　買えるアイテムが　増えます。\n$ご褒美を　選択すると　次のラウンドに\n進むから、まず　消耗品を　買ってください。",
+  "eggGacha": "この画面では、「タマゴクーポン」で\nポケモンのタマゴを　取得できます。\n$タマゴは　ラウンドが進めるうちに　ふかします。\nタマゴのふかは　レア度によって　時間が　かかります。\n$ふかしたポケモンは　手持ちに　加えられず、\nスターターに　登録されます。\n$ふかしたポケモンは　一般的に\n野生ポケモンよりも　高い個体値があります。\n$あるポケモンは　タマゴからしか　手に入りません。\n$各ガチャマシンは　個性的なボーナスが　あるますから、\n好きな方から　引いてみてください！,"
+}
--- a/src/locales/ko/battler-tags.json
+++ b/src/locales/ko/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}}[[는]]\n저주받고 있다!",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}}[[는]]\n{{stockpiledCount}}개 비축했다!",
  "disabledOnAdd": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n사용할 수 없다!",
-  "disabledLapse": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n이제 사용할 수 있다."
+  "disabledLapse": "{{pokemonNameWithAffix}}의 {{moveName}}[[는]]\n이제 사용할 수 있다.",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}}[[는]] 불꽃에 약해졌다!"
 }
--- a/src/locales/ko/fight-ui-handler.json
+++ b/src/locales/ko/fight-ui-handler.json
@ -2,6 +2,7 @@
  "pp": "PP",
  "power": "위력",
  "accuracy": "명중률",
-  "abilityFlyInText": " {{pokemonName}}의 {{passive}}{{abilityName}}",
-  "passive": "패시브 "
-}
+  "abilityFlyInText": " {{pokemonName}}의\n{{passive}}{{abilityName}}",
+  "passive": "패시브 ",
+  "teraHover": "{{type}} 테라스탈"
+}
--- a/src/locales/ko/move-trigger.json
+++ b/src/locales/ko/move-trigger.json
@ -66,5 +66,6 @@
  "revivalBlessing": "{{pokemonName}}[[는]]\n정신을 차려 싸울 수 있게 되었다!",
  "swapArenaTags": "{{pokemonName}}[[는]]\n서로의 필드 효과를 교체했다!",
  "exposedMove": "{{pokemonName}}[[는]]\n{{targetPokemonName}}의 정체를 꿰뚫어 보았다!",
-  "safeguard": "{{targetName}}[[는]] 신비의 베일이 지켜 주고 있다!"
+  "safeguard": "{{targetName}}[[는]] 신비의 베일이 지켜 주고 있다!",
+  "afterYou": "{{pokemonName}}[[는]]\n배려를 받아들이기로 했다!"
 }
--- a/src/locales/pt_BR/ability-trigger.json
+++ b/src/locales/pt_BR/ability-trigger.json
@ -12,6 +12,7 @@
  "blockItemTheft": "{{abilityName}} de {{pokemonNameWithAffix}}\nprevine o roubo de itens!",
  "typeImmunityHeal": "{{abilityName}} de {{pokemonNameWithAffix}}\nrestaurou um pouco de PS!",
  "nonSuperEffectiveImmunity": "{{pokemonNameWithAffix}} evitou dano\ncom {{abilityName}}!",
+  "fullHpResistType": "{{pokemonNameWithAffix}} fez seu casco brilhar!\nEstá distorcendo o confronte de tipos!",
  "moveImmunity": "Isso não afeta {{pokemonNameWithAffix}}!",
  "reverseDrain": "{{pokemonNameWithAffix}} absorveu a gosma líquida!",
  "postDefendTypeChange": "{{abilityName}} de {{pokemonNameWithAffix}}\ntransformou-o no tipo {{typeName}}!",
--- a/src/locales/pt_BR/battle.json
+++ b/src/locales/pt_BR/battle.json
@ -44,6 +44,7 @@
  "moveNotImplemented": "{{moveName}} ainda não foi implementado e não pode ser usado.",
  "moveNoPP": "Não há mais PP\npara esse movimento!",
  "moveDisabled": "Não se pode usar {{moveName}} porque foi desabilitado!",
+  "disableInterruptedMove": "{{moveName}} de {{pokemonNameWithAffix}}\nestá desabilitado!",
  "noPokeballForce": "Uma força misteriosa\nte impede de usar Poké Bolas.",
  "noPokeballTrainer": "Não se pode capturar\nPokémon dos outros!",
  "noPokeballMulti": "Não se pode lançar Poké Bolas\nquando há mais de um Pokémon!",
@ -61,6 +62,7 @@
  "skipItemQuestion": "Tem certeza de que não quer escolher um item?",
  "itemStackFull": "O estoque de {{fullItemName}} está cheio.\nVocê receberá {{itemName}} no lugar.",
  "eggHatching": "Opa?",
+  "eggSkipPrompt": "Pular para súmario de ovos?",
  "ivScannerUseQuestion": "Quer usar o Scanner de IVs em {{pokemonName}}?",
  "wildPokemonWithAffix": "{{pokemonName}} selvagem",
  "foePokemonWithAffix": "{{pokemonName}} adversário",
@ -89,7 +91,7 @@
  "statSeverelyFell_other": "{{stats}} de {{pokemonNameWithAffix}} diminuíram severamente!",
  "statWontGoAnyLower_one": "{{stats}} de {{pokemonNameWithAffix}} não vai mais diminuir!",
  "statWontGoAnyLower_other": "{{stats}} de {{pokemonNameWithAffix}} não vão mais diminuir!",
-  "transformedIntoType": "{{pokemonName}} transformed\ninto the {{type}} type!",
+  "transformedIntoType": "{{pokemonName}} se transformou\nno tipo {{type}}!",
  "ppReduced": "O PP do movimento {{moveName}} de\n{{targetName}} foi reduzido em {{reduction}}!",
  "retryBattle": "Você gostaria de tentar novamente desde o início da batalha?",
  "unlockedSomething": "{{unlockedThing}}\nfoi desbloqueado.",
--- a/src/locales/pt_BR/battler-tags.json
+++ b/src/locales/pt_BR/battler-tags.json
@ -67,5 +67,8 @@
  "saltCuredLapse": "{{pokemonNameWithAffix}} foi ferido pelo {{moveName}}!",
  "cursedOnAdd": "{{pokemonNameWithAffix}} cortou seus PS pela metade e amaldiçoou {{pokemonName}}!",
  "cursedLapse": "{{pokemonNameWithAffix}} foi ferido pelo Curse!",
-  "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!"
+  "stockpilingOnAdd": "{{pokemonNameWithAffix}} estocou {{stockpiledCount}}!",
+  "disabledOnAdd": "{{moveName}} de {{pokemonNameWithAffix}}\nfoi desabilitado!",
+  "disabledLapse": "{{moveName}} de {{pokemonNameWithAffix}}\nnão está mais desabilitado.",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}} tornou-se mais fraco ao fogo!"
 }
--- a/src/locales/pt_BR/challenges.json
+++ b/src/locales/pt_BR/challenges.json
@ -1,6 +1,7 @@
 {
  "title": "Desafios",
  "illegalEvolution": "{{pokemon}} não pode ser escolhido\nnesse desafio!",
+  "noneSelected": "Nada Selecionado",
  "singleGeneration": {
    "name": "Geração Única",
    "desc": "Você só pode user Pokémon da {{gen}} geração.",
@ -33,4 +34,4 @@
    "value.0": "Desligado",
    "value.1": "Ligado"
  }
-}
+}
--- a/src/locales/pt_BR/fight-ui-handler.json
+++ b/src/locales/pt_BR/fight-ui-handler.json
@ -3,5 +3,6 @@
  "power": "Poder",
  "accuracy": "Precisão",
  "abilityFlyInText": " {{passive}}{{pokemonName}}\n{{abilityName}}",
-  "passive": "Passiva de "
-}
+  "passive": "Passiva de ",
+  "teraHover": "Terastalizado {{type}}"
+}
--- a/src/locales/pt_BR/move-trigger.json
+++ b/src/locales/pt_BR/move-trigger.json
@ -62,5 +62,6 @@
  "revivalBlessing": "{{pokemonName}} foi reanimado!",
  "swapArenaTags": "{{pokemonName}} trocou os efeitos de batalha que afetam cada lado do campo!",
  "exposedMove": "{{pokemonName}} identificou\n{{targetPokemonName}}!",
-  "safeguard": "{{targetName}} está protegido por Safeguard!"
+  "safeguard": "{{targetName}} está protegido por Safeguard!",
+  "afterYou": "{{pokemonName}} aceitou a gentil oferta!"
 }
--- a/src/locales/zh_CN/ability.json
+++ b/src/locales/zh_CN/ability.json
@ -469,7 +469,7 @@
  },
  "honeyGather": {
    "name": "采蜜",
-    "description": "The Pokémon gat\nhers Honey afte\nr a battle. The\n Honey is then \nsold for money."
+    "description": "战斗结束时，有时候会捡来甜甜蜜。\n甜甜蜜会转换成金钱。"
  },
  "frisk": {
    "name": "察觉",
@ -1239,4 +1239,4 @@
    "name": "毒傀儡",
    "description": "因桃歹郎的招式而陷入中毒状态的\n对手同时也会陷入混乱状态。"
  }
-}
+}
--- a/src/locales/zh_CN/achv.json
+++ b/src/locales/zh_CN/achv.json
@ -23,7 +23,7 @@
  },

  "DamageAchv": {
-    "description": "在单次攻击中造成 {{damageAmount}} 点伤害"
+    "description": "在单次攻击中造成\n {{damageAmount}} 点伤害"
  },
  "250_DMG": {
    "name": "重拳出击"
@ -39,7 +39,7 @@
  },

  "HealAchv": {
-    "description": "通过技能、能力或携带的道具一次性治疗 {{healAmount}} {{HP}}点"
+    "description": "通过技能、能力或携带的道具\n一次性治疗 {{healAmount}} {{HP}}点"
  },
  "250_HEAL": {
    "name": "新手奶妈"
@ -88,11 +88,11 @@

  "TRANSFER_MAX_STAT_STAGE": {
    "name": "团队协作",
-    "description": "在一项属性强化至最大时用接力棒传递给其他宝可梦"
+    "description": "在一项属性强化至最大时用\n接力棒传递给其他宝可梦"
  },
  "MAX_FRIENDSHIP": {
    "name": "亲密无间",
-    "description": "使一只宝可梦的亲密度达到最大值"
+    "description": "使一只宝可梦的亲密度\n达到最大值"
  },
  "MEGA_EVOLVE": {
    "name": "大变身",
@ -112,7 +112,7 @@
  },
  "SPLICE": {
    "name": "无限融合",
-    "description": "使用基因之楔将两只宝可梦融合在一起"
+    "description": "使用基因之楔将两只宝可梦\n融合在一起"
  },
  "MINI_BLACK_HOLE": {
    "name": "一大洞的道具",
@ -136,7 +136,7 @@
  },
  "SHINY_PARTY": {
    "name": "呕心沥血",
-    "description": "拥有一支由闪光宝可梦组成的满员队伍"
+    "description": "拥有一支由闪光宝可梦组成\n的满员队伍"
  },
  "HATCH_MYTHICAL": {
    "name": "幻兽蛋",
@ -144,7 +144,7 @@
  },
  "HATCH_SUB_LEGENDARY": {
    "name": "二级传说蛋",
-    "description": "从蛋中孵化出一只二级传说宝可梦"
+    "description": "从蛋中孵化出一只二级传说\n宝可梦"
  },
  "HATCH_LEGENDARY": {
    "name": "传说蛋",
@ -156,19 +156,19 @@
  },
  "HIDDEN_ABILITY": {
    "name": "隐藏实力",
-    "description": "捕捉一只拥有隐藏特性的宝可梦"
+    "description": "捕捉一只拥有隐藏特性\n的宝可梦"
  },
  "PERFECT_IVS": {
    "name": "合格证",
-    "description": "获得一只拥有完美个体值的宝可梦"
+    "description": "获得一只拥有完美个体值\n的宝可梦"
  },
  "CLASSIC_VICTORY": {
    "name": "战无不胜",
    "description": "在经典模式中通关游戏"
  },
  "UNEVOLVED_CLASSIC_VICTORY": {
-    "name": "带孩子来上班",
-    "description": "通关经典模式时队伍中至少有一名未进化的宝可梦"
+    "name": "带孩上班",
+    "description": "通关经典模式时队伍中至少有\n一名未进化的宝可梦"
  },

  "MONO_GEN_ONE": {
--- a/src/locales/zh_CN/battle.json
+++ b/src/locales/zh_CN/battle.json
@ -15,7 +15,7 @@
  "moneyPickedUp": "捡到了₽{{moneyAmount}}！",
  "pokemonCaught": "{{pokemonName}}被抓住了！",
  "addedAsAStarter": "增加了{{pokemonName}}作为\n一个新的基础宝可梦！",
-  "partyFull": "你的队伍已满员。是否放生其他宝可梦\n为{{pokemonName}}腾出空间?",
+  "partyFull": "你的队伍已满员。是否放生其他宝可梦\n为{{pokemonName}}腾出空间？",
  "pokemon": "宝可梦",
  "sendOutPokemon": "上吧！\n{{pokemonName}}！",
  "hitResultCriticalHit": "击中了要害！",
--- a/src/locales/zh_CN/battler-tags.json
+++ b/src/locales/zh_CN/battler-tags.json
@ -69,5 +69,6 @@
  "cursedLapse": "{{pokemonNameWithAffix}}\n正受到诅咒！",
  "stockpilingOnAdd": "{{pokemonNameWithAffix}}蓄力了{{stockpiledCount}}次！",
  "disabledOnAdd": "封住了{{pokemonNameWithAffix}}的\n{{moveName}}！",
-  "disabledLapse": "{{pokemonNameWithAffix}}的\n定身法解除了！"
+  "disabledLapse": "{{pokemonNameWithAffix}}的\n定身法解除了！",
+  "tarShotOnAdd": "{{pokemonNameWithAffix}}\n变得怕火了！"
 }
--- a/src/locales/zh_CN/bgm-name.json
+++ b/src/locales/zh_CN/bgm-name.json
@ -57,7 +57,7 @@
  "battle_legendary_dusk_dawn": "究极日月「战斗！日食・月食 奈克洛兹玛」",
  "battle_legendary_ultra_nec": "究极日月「战斗！究极奈克洛兹玛」",
  "battle_legendary_zac_zam": "剑盾「战斗！苍响・藏玛然特」",
-  "battle_legendary_glas_spec": "剑盾「战斗! 雪暴马・灵幽马」",
+  "battle_legendary_glas_spec": "剑盾「战斗！ 雪暴马・灵幽马」",
  "battle_legendary_calyrex": "剑盾「战斗！蕾冠王」",
  "battle_legendary_birds_galar": "剑盾「战斗！传说的鸟宝可梦」",
  "battle_legendary_ruinous": "朱紫「战斗！灾厄宝可梦」",
@ -117,9 +117,9 @@
  "plains": "空之探险队「天空顶端（草原）」",
  "power_plant": "空之探险队「电气平原 深处」",
  "ruins": "空之探险队「封印岩地 深处」",
-  "sea": "Andr06 - Marine Mystique",
+  "sea": "Andr06 - 海洋之秘",
  "seabed": "Firel - 海底",
-  "slum": "Andr06 - Sneaky Snom",
+  "slum": "Andr06 - 狡猾的雪吞虫",
  "snowy_forest": "空之探险队「天空顶端（雪山）」",
  "space": "Firel - 太空",
  "swamp": "空之探险队「封闭之海」",
--- a/src/locales/zh_CN/dialogue-double-battle.json
+++ b/src/locales/zh_CN/dialogue-double-battle.json
@ -9,10 +9,10 @@
  },
  "red_blue_double": {
    "encounter": {
-      "1": "赤红: ...!$青绿： 他人狠话不多。$青绿： 但别被他耍了，\n毕竟他可是个冠军！"
+      "1": "赤红: ...！$青绿： 他人狠话不多。$青绿： 但别被他耍了，\n毕竟他可是个冠军！"
    },
    "victory": {
-      "1": "赤红: ...!$青绿: 下次我们一定会赢你！"
+      "1": "赤红: ...！$青绿: 下次我们一定会赢你！"
    }
  },
  "tate_liza_double": {
@ -79,4 +79,4 @@
      "1": "聂梓：这首歌献给大家！$玛俐：哥哥……"
    }
  }
-}
+}
--- a/src/locales/zh_CN/dialogue-misc.json
+++ b/src/locales/zh_CN/dialogue-misc.json
@ -1,4 +1,4 @@
 {
  "ending": "@c{shock}你回来了？@d{32} 也就是说…@d{96} 你赢了呀！？\n@c{smile_ehalf}我应该早料到了。\n$@c{smile_eclosed}当然…我一直有这种感觉\n@c{smile}一切都结束了，对么？ 你打破了循环。\n$@c{smile_ehalf}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$我是唯一能够记得你所作所为的人\n@c{angry_mopen}我会努力不忘掉哒！\n$@c{smile_wave_wink}开玩笑啦，@d{64} @c{smile}我才不会忘呢。@d{32}\n你的传奇将永远留存于我们心中。\n$@c{smile_wave}不管了，@d{64} 时候不早了@d{96} ，应该吧？\n在这地方还真搞不清楚。\n$一起回家吧。 @c{smile_wave_wink}可能明天，我们再来打一场，为了重温回忆嘛~",
-  "ending_female": "@c{smile}哦?你赢了？@d{96} @c{smile_eclosed}我应该早猜到了\n你回来了。\n$@c{smile}结束了。@d{64} 你终结了这个循环。\n$@c{serious_smile_fists}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$@c{neutral}我是唯一能够记得你所作所为的人@d{96}\n我觉得这应该也还行吧？\n$@c{serious_smile_fists}你的传奇将永远留存于我们心中。\n$@c{smile_eclosed}不管了，我真是受够这个地方了，你也一样吗？我们回家吧。\n$@c{serious_smile_fists}可能等我们回家以后，再打一场？\n要是你想的话"
+  "ending_female": "@c{smile}哦？你赢了？@d{96} @c{smile_eclosed}我应该早猜到了\n你回来了。\n$@c{smile}结束了。@d{64} 你终结了这个循环。\n$@c{serious_smile_fists}你也完成了自己的梦想，不是吗？\n你甚至一次都没失败。\n$@c{neutral}我是唯一能够记得你所作所为的人@d{96}\n我觉得这应该也还行吧？\n$@c{serious_smile_fists}你的传奇将永远留存于我们心中。\n$@c{smile_eclosed}不管了，我真是受够这个地方了，你也一样吗？我们回家吧。\n$@c{serious_smile_fists}可能等我们回家以后，再打一场？\n要是你想的话"
 }
--- a/src/locales/zh_CN/dialogue.json
+++ b/src/locales/zh_CN/dialogue.json
@ -388,7 +388,7 @@
    "victory": {
      "1": "大失误……",
      "2": "以我现在的实力，无法胜任我的任务……",
-      "3": "原……谅我，坂木。\n我竟被一名训练师打败了。."
+      "3": "原……谅我，坂木。\n我竟被一名训练师打败了。"
    }
  },
  "ariana": {
@ -1230,14 +1230,14 @@
  },
  "crasher_wake": {
    "encounter": {
-      "1": "极限! 极限! 看好了!$极限假面…就此…登场!",
-      "2": "极限! 极限! 极限假面!",
+      "1": "极限！ 极限！ 看好了！$极限假面…就此…登场！",
+      "2": "极限！ 极限！ 极限假面！",
      "3": "我是滔滔巨浪，将你冲走！"
    },
    "victory": {
      "1": "我真是笑得合不拢嘴啊！$哈哈哈！那真是太有趣了！",
      "2": "呼哇！结束收尾了！$我该怎么说呢……$我还想再对战！我还想再继续战斗！",
-      "3": "啊啊啊啊啊!?"
+      "3": "啊啊啊啊啊！？"
    },
    "defeat": {
      "1": "耶！就是这样！",
@ -1254,7 +1254,7 @@
    "victory": {
      "1": "明白了……我会礼貌地退场。",
      "2": "输了就是输了。你确实很强大。",
-      "3": "…行吧! 嗯, 我输了。"
+      "3": "…行吧！ 嗯, 我输了。"
    },
    "defeat": {
      "1": "爸爸！我用你珍爱的飞行宝可梦赢了……",
@ -1576,7 +1576,7 @@
  },
  "clay": {
    "encounter": {
-      "1": "咳咳! 让我好等，不是吗，孩子？$好吧，是时候看看你能做到什么了！"
+      "1": "咳咳！ 让我好等，不是吗，孩子？$好吧，是时候看看你能做到什么了！"
    },
    "victory": {
      "1": "真是的……我先说好，\n我可没有手下留情。"
@ -1802,7 +1802,7 @@
      "1": "够野的！你的想法比我的还要毒！"
    },
    "defeat": {
-      "1": "嘿，拜托！认真点！\n你要加把劲啊!"
+      "1": "嘿，拜托！认真点！\n你要加把劲啊！"
    }
  },
  "olivia": {
@ -1884,7 +1884,7 @@
  },
  "wikstrom": {
    "encounter": {
-      "1": "年轻的挑战者，幸会！\n我乃是著名的钢铁之刃，公爵雁铠! $让我们开始战斗吧！预备！"
+      "1": "年轻的挑战者，幸会！\n我乃是著名的钢铁之刃，公爵雁铠！ $让我们开始战斗吧！预备！"
    },
    "victory": {
      "1": "辉煌！你与你尊贵的\n宝可梦之间的信任居然胜过了我！"
@ -1921,7 +1921,7 @@
      "2": "我知道你能走这么远。让我们开始吧。"
    },
    "victory": {
-      "1": "被你拿下了啊。你太出色了!",
+      "1": "被你拿下了啊。你太出色了！",
      "2": "我从没想到会有另一个训练师打败我……$我很惊讶。"
    },
    "defeat": {
@ -2025,13 +2025,13 @@
  },
  "red": {
    "encounter": {
-      "1": "…!"
+      "1": "…！"
    },
    "victory": {
-      "1": "…?"
+      "1": "…？"
    },
    "defeat": {
-      "1": "…!"
+      "1": "…！"
    }
  },
  "jasmine": {
@ -2303,7 +2303,7 @@
  },
  "grant": {
    "encounter": {
-      "1": "我只期待一件事。. $通过超越彼此，\n我们找到通往更高境界的道路。"
+      "1": "我只期待一件事。$通过超越彼此，\n我们找到通往更高境界的道路。"
    },
    "victory": {
      "1": "你是一堵我无法逾越的墙！"
@ -2413,7 +2413,7 @@
  },
  "marnie": {
    "encounter": {
-      "1": "事实上，言而总之… \n人家自己也想当冠军呀! $所以别认为我在针对你！"
+      "1": "事实上，言而总之… \n人家自己也想当冠军呀！ $所以别认为我在针对你！"
    },
    "victory": {
      "1": "好吧，我还是输了……\n但是我看到了很多你和你宝可梦的优点哦"
@ -2468,13 +2468,13 @@
  },
  "ryme": {
    "encounter": {
-      "1": "宝贝, 一起! \n摇滚摇到骨子里!"
+      "1": "宝贝, 一起！ \n摇滚摇到骨子里！"
    },
    "victory": {
      "1": "你好酷！我佩服！\n我的灵魂为你哭！"
    },
    "defeat": {
-      "1": "再会, 宝贝!"
+      "1": "再会, 宝贝！"
    }
  },
  "grusha": {
@ -2625,7 +2625,7 @@
  },
  "rival_3_female": {
    "encounter": {
-      "1": "@c{smile_wave}好久不见！还没输过，对吧。$@c{angry}我觉得你点烦了。@c{smile_wave_wink}开玩笑啦！$@c{smile_ehalf}但说真的，你现在不想家吗？\n不想…我吗?$我……我的意思是，我们真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的梦想。\n但现实就是你早晚会经历失败。$@c{smile}当你失败的时候，我想像往常一样陪在你身边。$@c{angry_mopen}现在，给你看看我变得多强了吧！"
+      "1": "@c{smile_wave}好久不见！还没输过，对吧。$@c{angry}我觉得你点烦了。@c{smile_wave_wink}开玩笑啦！$@c{smile_ehalf}但说真的，你现在不想家吗？\n不想…我吗？$我……我的意思是，我们真的很想你。$@c{smile_eclosed}我支持你的一切，包括你的梦想。\n但现实就是你早晚会经历失败。$@c{smile}当你失败的时候，我想像往常一样陪在你身边。$@c{angry_mopen}现在，给你看看我变得多强了吧！"
    },
    "victory": {
      "1": "@c{shock}都这样了……还是不够吗？$这样下去，你就永远不会回来了……"
--- a/src/locales/zh_CN/fight-ui-handler.json
+++ b/src/locales/zh_CN/fight-ui-handler.json
@ -2,6 +2,7 @@
  "pp": "PP",
  "power": "威力",
  "accuracy": "命中",
-  "abilityFlyInText": " {{pokemonName}} 的 {{passive}}{{abilityName}}",
-  "passive": "被动 "
-}
+  "abilityFlyInText": " {{pokemonName}} 的\n{{passive}}{{abilityName}}",
+  "passive": "被动 ",
+  "teraHover": "{{type}} 太晶化"
+}
--- a/src/locales/zh_CN/modifier-type.json
+++ b/src/locales/zh_CN/modifier-type.json
@ -95,7 +95,7 @@
      "description": "招式命中率增加{{accuracyAmount}}(最大100)。"
    },
    "PokemonMultiHitModifierType": {
-      "description": "攻击以40/25/12.5%的伤害造成2/3/4次伤害"
+      "description": "攻击以60/75/82.5%的伤害造成2/3/4次伤害。"
    },
    "TmModifierType": {
      "name": "招式学习器\n{{moveId}} - {{moveName}}",
@ -314,19 +314,19 @@
    },
    "BERRY_POUCH": {
      "name": "树果袋",
-      "description": "使用树果时有30%的几率不会消耗树果。"
+      "description": "使用树果时增加30%的几率不会消耗树果。"
    },
    "FOCUS_BAND": {
      "name": "气势头带",
-      "description": "携带该道具的宝可梦有10%几率在受到攻击\n而将陷入濒死状态时，保留1点HP不陷入濒死状态。"
+      "description": "携带该道具的宝可梦增加10%几率在受到攻击\n而将陷入濒死状态时，保留1点HP不陷入濒死状态。"
    },
    "QUICK_CLAW": {
      "name": "先制之爪",
-      "description": "有10%的几率无视速度优先使出招式\n(先制技能优先)。"
+      "description": "增加10%的几率无视速度优先使出招式\n(先制技能优先)。"
    },
    "KINGS_ROCK": {
      "name": "王者之证",
-      "description": "使用任意原本不会造成畏缩状态的攻击，\n有10%几率使目标陷入畏缩状态。"
+      "description": "使用任意原本不会造成畏缩状态的攻击，\n增加10%几率使目标陷入畏缩状态。"
    },
    "LEFTOVERS": {
      "name": "吃剩的东西",
--- a/src/locales/zh_CN/move-trigger.json
+++ b/src/locales/zh_CN/move-trigger.json
@ -42,12 +42,12 @@
  "incineratedItem": "{{pokemonName}}烧没了\n{{targetName}}的{{itemName}}！",
  "knockedOffItem": "{{pokemonName}}拍落了\n{{targetName}}的{{itemName}}！",
  "tookMoveAttack": "{{pokemonName}}\n受到了{{moveName}}的攻击！",
-  "cutOwnHpAndMaximizedStat": "{{pokemonName}}\n削减了体力并释放了全部{{statName}}!",
+  "cutOwnHpAndMaximizedStat": "{{pokemonName}}\n削减了体力并释放了全部{{statName}}！",
  "copiedStatChanges": "{{pokemonName}}复制了\n{{targetName}}的能力变化！",
  "magnitudeMessage": "震级{{magnitude}}！",
  "tookAimAtTarget": "{{pokemonName}}将目标对准了\n{{targetName}}！",
  "transformedIntoType": "{{pokemonName}} \n变成了{{typeName}}属性！",
-  "copiedMove": "{{pokemonName}}\n复制了{{moveName}}!",
+  "copiedMove": "{{pokemonName}}\n复制了{{moveName}}！",
  "sketchedMove": "{{pokemonName}}\n对{{moveName}}进行了写生！",
  "acquiredAbility": "{{pokemonName}}的特性\n变为{{abilityName}}了！",
  "copiedTargetAbility": "{{pokemonName}}复制了\n{{targetName}}的{{abilityName}}！",
@ -66,5 +66,6 @@
  "revivalBlessing": "{{pokemonName}}复活了！",
  "swapArenaTags": "{{pokemonName}}\n交换了双方的场地效果！",
  "exposedMove": "{{pokemonName}}识破了\n{{targetPokemonName}}的原型！",
-  "safeguard": "{{targetName}}\n正受到神秘之幕的保护！"
-}
+  "safeguard": "{{targetName}}\n正受到神秘之幕的保护！",
+  "afterYou": "{{pokemonName}}\n接受了对手的好意！"
+}
--- a/src/locales/zh_CN/party-ui-handler.json
+++ b/src/locales/zh_CN/party-ui-handler.json
@ -23,7 +23,7 @@
  "tooManyItems": "{{pokemonName}}拥有\n太多这个道具了！",
  "anyEffect": "即便使用也无效果哦。",
  "unpausedEvolutions": "{{pokemonName}}的进化停止了。",
-  "unspliceConfirmation": "真的要把{{fusionName}}\n从{{pokemonName}}身上分离吗? {{fusionName}}会就此消失。",
+  "unspliceConfirmation": "真的要把{{fusionName}}\n从{{pokemonName}}身上分离吗？{{fusionName}}会就此消失。",
  "wasReverted": "{{fusionName}}恢复成了{{pokemonName}}。",
  "releaseConfirmation": "你真要放生{{pokemonName}}吗？",
  "releaseInBattle": "你无法放生正在战斗中的宝可梦！",
@ -44,4 +44,4 @@
  "untilWeMeetAgain": "下次再见了，{{pokemonName}}！",
  "sayonara": "撒由那拉，{{pokemonName}}！",
  "smellYaLater": "拜拜了您嘞，{{pokemonName}}！"
-}
+}
--- a/src/locales/zh_CN/pokemon-form.json
+++ b/src/locales/zh_CN/pokemon-form.json
@ -1,5 +1,5 @@
 {
-  "pikachuCosplay": "服装",
+  "pikachuCosplay": "换装",
  "pikachuCoolCosplay": "摇滚巨星",
  "pikachuBeautyCosplay": "贵妇",
  "pikachuCuteCosplay": "流行偶像",
@ -167,4 +167,4 @@
  "paldeaTaurosCombat": "斗战种",
  "paldeaTaurosBlaze": "火炽种",
  "paldeaTaurosAqua": "水澜种"
-}
+}
--- a/src/locales/zh_CN/splash-messages.json
+++ b/src/locales/zh_CN/splash-messages.json
@ -6,7 +6,7 @@
  "optionalSaveScumming": "可用SL大法！",
  "biomes": "35种地区！",
  "openSource": "开源！",
-  "playWithSpeed": "请五倍速游玩!",
+  "playWithSpeed": "请五倍速游玩！",
  "liveBugTesting": "随时修复BUG！",
  "heavyInfluence": "深受雨中冒险2影响！",
  "pokemonRiskAndPokemonRain": "雨中宝可梦冒险！",
@ -33,4 +33,4 @@
  "eeveeExpo": "伊布博览会！",
  "ynoproject": "Yume Nikki 页游项目！",
  "breedersInSpace": "饲养员也能上太空？"
-}
+}
--- a/src/locales/zh_CN/starter-select-ui-handler.json
+++ b/src/locales/zh_CN/starter-select-ui-handler.json
@ -21,8 +21,8 @@
  "toggleIVs": "显示个体",
  "manageMoves": "管理招式",
  "manageNature": "管理性格",
-  "addToFavorites": "Add to Favorites",
-  "removeFromFavorites": "Remove from Favorites",
+  "addToFavorites": "添加到最爱",
+  "removeFromFavorites": "移出最爱",
  "useCandies": "使用糖果",
  "selectNature": "选择性格",
  "selectMoveSwapOut": "选择要替换的招式。",
@ -42,4 +42,4 @@
  "locked": "未解锁",
  "disabled": "已禁用",
  "uncaught": "未捕获"
-}
+}
--- a/Show More
+++ b/Show More