diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 2850418bc59..a8eea069ba6 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -21,10 +21,10 @@ jobs: steps: - name: Check out Git repository # Step to check out the repository - uses: actions/checkout@v2 # Use the checkout action version 2 + 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@v1 # Use the setup-node action version 1 + uses: actions/setup-node@v4 # Use the setup-node action version 4 with: node-version: 20 # Specify Node.js version 20 @@ -32,4 +32,4 @@ jobs: run: npm ci # Use 'npm ci' to install dependencies - name: eslint # Step to run linters - run: npm run eslint-ci \ No newline at end of file + run: npm run eslint-ci diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index c5d8e039f9a..c648ff485b7 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -3984,6 +3984,9 @@ export class PlayerPokemon extends Pokemon { this.fusionVariant = pokemon.variant; this.fusionGender = pokemon.gender; this.fusionLuck = pokemon.luck; + if ((pokemon.pauseEvolutions) || (this.pauseEvolutions)) { + this.pauseEvolutions = true; + } this.scene.validateAchv(achvs.SPLICE); this.scene.gameData.gameStats.pokemonFused++; diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts index 9e025dbe086..270163a3d3e 100644 --- a/src/ui/party-ui-handler.ts +++ b/src/ui/party-ui-handler.ts @@ -877,7 +877,7 @@ export default class PartyUiHandler extends MessageUiHandler { this.options.push(PartyOption.SUMMARY); this.options.push(PartyOption.RENAME); - if (pokemon.pauseEvolutions && pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId)) { + if (pokemon.pauseEvolutions && (pokemonEvolutions.hasOwnProperty(pokemon.species.speciesId) || (pokemon.isFusion() && pokemon.fusionSpecies && pokemonEvolutions.hasOwnProperty(pokemon.fusionSpecies.speciesId)))) { this.options.push(PartyOption.UNPAUSE_EVOLUTION); }