From 909d166dd708a51ee7c15a0f4f8d87fa6dc66121 Mon Sep 17 00:00:00 2001 From: Lylian BALL <131535108+PyGaVS@users.noreply.github.com> Date: Mon, 5 Aug 2024 01:19:30 +0200 Subject: [PATCH 1/2] nit update src/field/pokemon.ts Co-authored-by: Adrian T. <68144167+torranx@users.noreply.github.com> --- src/field/pokemon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 365d8c545f1..c25d30b8b98 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -128,7 +128,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { const randAbilityIndex = Utils.randSeedInt(2); this.species = species; - this.illusion = {active: false, available: true}; + this.illusion = { active: false, available: true }; this.pokeball = dataSource?.pokeball || PokeballType.POKEBALL; this.level = level; From 205ee8367b28c2949dfdd05ce3837140fa4e9211 Mon Sep 17 00:00:00 2001 From: Lylian BALL <131535108+PyGaVS@users.noreply.github.com> Date: Mon, 5 Aug 2024 01:20:55 +0200 Subject: [PATCH 2/2] nit update src/phases.ts Co-authored-by: Amani H. <109637146+xsn34kzx@users.noreply.github.com> --- src/phases.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/phases.ts b/src/phases.ts index 6cc1db399c0..f4f4deefa69 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1592,8 +1592,6 @@ export class SwitchSummonPhase extends SummonPhase { } const pokemon: Pokemon = this.getPokemon(); - // if doReturn === False OR slotIndex !== -1 (slotIndex is valid) and the pokemon doesn't exist/is false - // then switchAndSummon(), manually pick pokemon to switch into if (!this.doReturn || (this.slotIndex !== -1 && !(this.player ? this.scene.getParty() : this.scene.getEnemyParty())[this.slotIndex])) { if (this.player) { return this.switchAndSummon();