mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-21 14:59:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert fix for Keldeo crashes + implement fix suggestion from PR #4619

Browse Source
This commit is contained in:
MokaStitcher 2024-10-20 21:55:15 +02:00
parent d400dd93ab
commit eea0f4b3ee
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/field/pokemon.ts
View File

@ -2189,7 +2189,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.moveset.push(new PokemonMove(movePool[index][0], 0, 0)); this.moveset.push(new PokemonMove(movePool[index][0], 0, 0));
} }
this.scene.triggerPokemonFormChange(this, SpeciesFormChangeMoveLearnedTrigger); // Trigger FormChange, except for enemy Pokemon during Mystery Encounters, to avoid crashes
if (this.isPlayer() || !this.scene.currentBattle.isBattleMysteryEncounter() || !this.scene.currentBattle.mysteryEncounter) {
this.scene.triggerPokemonFormChange(this, SpeciesFormChangeMoveLearnedTrigger);
}
} }
trySelectMove(moveIndex: integer, ignorePp?: boolean): boolean { trySelectMove(moveIndex: integer, ignorePp?: boolean): boolean {

7
src/phases/encounter-phase.ts
View File

@ -36,7 +36,6 @@ import { MysteryEncounterPhase } from "#app/phases/mystery-encounter-phases";
import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils"; import { getGoldenBugNetSpecies } from "#app/data/mystery-encounters/utils/encounter-pokemon-utils";
import { Biome } from "#enums/biome"; import { Biome } from "#enums/biome";
import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters"; import { WEIGHT_INCREMENT_ON_SPAWN_MISS } from "#app/data/mystery-encounters/mystery-encounters";
import { QuietFormChangePhase } from "#app/phases/quiet-form-change-phase";
export class EncounterPhase extends BattlePhase { export class EncounterPhase extends BattlePhase {
private loaded: boolean; private loaded: boolean;
@ -385,12 +384,6 @@ export class EncounterPhase extends BattlePhase {
encounter.onVisualsStart(this.scene); encounter.onVisualsStart(this.scene);
} }
// Clear any lingering QuietFormChangePhases which can be inadvertently added by certain wild Pokemon forms
let phaseRemoved: boolean = true;
while (phaseRemoved) {
phaseRemoved = this.scene.tryRemoveUnshiftedPhase(phase => phase instanceof QuietFormChangePhase);
}
const doEncounter = () => { const doEncounter = () => {
const doShowEncounterOptions = () => { const doShowEncounterOptions = () => {
this.scene.ui.clearText(); this.scene.ui.clearText();