From cf6f30cccab02d93327e2f1b6be8dce8c290ed32 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 27 Oct 2023 22:04:09 -0400 Subject: [PATCH] Fix trainer pools not evolving Pokemon --- src/data/move.ts | 2 +- src/trainer.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data/move.ts b/src/data/move.ts index f27c6950930..b3d60d9f3c1 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2919,7 +2919,7 @@ export function initMoves() { new AttackMove(Moves.SECRET_POWER, "Secret Power (N)", Type.NORMAL, MoveCategory.PHYSICAL, 70, 100, 20, -1, "Effects of the attack vary with the location.", 30, 0, 3) .makesContact(false), new AttackMove(Moves.DIVE, "Dive", Type.WATER, MoveCategory.PHYSICAL, 80, 100, 10, -1, "Dives underwater on first turn, attacks on second turn.", -1, 0, 3) - .attr(ChargeAttr, ChargeAnim.DIVE_CHARGING, 'hid\nunderwater!') + .attr(ChargeAttr, ChargeAnim.DIVE_CHARGING, 'hid\nunderwater!', BattlerTagType.UNDERGROUND) .ignoresVirtual(), new AttackMove(Moves.ARM_THRUST, "Arm Thrust", Type.FIGHTING, MoveCategory.PHYSICAL, 15, 100, 20, -1, "Hits 2-5 times in one turn.", -1, 0, 3) .attr(MultiHitAttr), diff --git a/src/trainer.ts b/src/trainer.ts index 62df6f4afee..d901b482f60 100644 --- a/src/trainer.ts +++ b/src/trainer.ts @@ -151,7 +151,7 @@ export default class Trainer extends Phaser.GameObjects.Container { tier--; } const tierPool = this.config.speciesPools[tier]; - ret = getPokemonSpecies(getPokemonSpecies(Phaser.Math.RND.pick(tierPool)).getSpeciesForLevel(level)); + ret = getPokemonSpecies(getPokemonSpecies(Phaser.Math.RND.pick(tierPool)).getSpeciesForLevel(level, true)); } else ret = getPokemonSpecies(this.scene.randomSpecies(battle.waveIndex, level, this.config.speciesFilter).getSpeciesForLevel(level));