From e04d22bc680b0ef1a1288f29819fd9119c0ddd2d Mon Sep 17 00:00:00 2001 From: Fabi Date: Thu, 5 Jun 2025 11:12:08 +0200 Subject: [PATCH 1/2] grey caught indicator for genderless pokemon --- src/field/pokemon.ts | 8 ++++++-- src/system/game-data.ts | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 329ba06fd09..ebf7e2fd35c 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -657,7 +657,12 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getDexAttr(): bigint { let ret = 0n; - ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE; + ret |= ret |= + this.gender === Gender.GENDERLESS + ? DexAttr.GENDERLESS + : this.gender !== Gender.FEMALE + ? DexAttr.MALE + : DexAttr.FEMALE; ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY; ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT; ret |= globalScene.gameData.getFormAttr(this.formIndex); @@ -6702,7 +6707,6 @@ export class EnemyPokemon extends Pokemon { return ret; } - /** * Show or hide the type effectiveness multiplier window * Passing undefined will hide the window diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 5711ad338c3..4a60f30bf97 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -248,6 +248,7 @@ export interface RunEntry { } export const DexAttr = { + GENDERLESS: 0n, NON_SHINY: 1n, SHINY: 2n, MALE: 4n, From 67faa4d3bb3118122742dbbff91f5a8e184fdd40 Mon Sep 17 00:00:00 2001 From: Fabi Date: Thu, 5 Jun 2025 23:02:29 +0200 Subject: [PATCH 2/2] adding suggestions --- src/field/pokemon.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index ebf7e2fd35c..0bceb1d7f1d 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -657,12 +657,13 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { getDexAttr(): bigint { let ret = 0n; - ret |= ret |= + ret |= this.gender === Gender.GENDERLESS ? DexAttr.GENDERLESS - : this.gender !== Gender.FEMALE - ? DexAttr.MALE - : DexAttr.FEMALE; + : this.gender === Gender.FEMALE + ? DexAttr.FEMALE + : DexAttr.MALE; + ret |= !this.shiny ? DexAttr.NON_SHINY : DexAttr.SHINY; ret |= this.variant >= 2 ? DexAttr.VARIANT_3 : this.variant === 1 ? DexAttr.VARIANT_2 : DexAttr.DEFAULT_VARIANT; ret |= globalScene.gameData.getFormAttr(this.formIndex);