From 5104f5712f9b28d3dcf1bc39febd55cba4a0d380 Mon Sep 17 00:00:00 2001 From: fabske0 <192151969+fabske0@users.noreply.github.com> Date: Mon, 14 Jul 2025 21:37:59 +0200 Subject: [PATCH] [Bug] grey caught indicator for genderless pokemon (#5935) * grey caught indicator for genderless pokemon * adding suggestions --------- Co-authored-by: damocleas --- src/enums/dex-attr.ts | 1 + src/field/pokemon.ts | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/enums/dex-attr.ts b/src/enums/dex-attr.ts index ee5ceb43ef2..52c77ea8ce8 100644 --- a/src/enums/dex-attr.ts +++ b/src/enums/dex-attr.ts @@ -1,4 +1,5 @@ export const DexAttr = Object.freeze({ + GENDERLESS: 0n, NON_SHINY: 1n, SHINY: 2n, MALE: 4n, diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 4d23c6e483a..8b8d63c17e3 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -558,7 +558,13 @@ export abstract class Pokemon extends Phaser.GameObjects.Container { getDexAttr(): bigint { let ret = 0n; - ret |= this.gender !== Gender.FEMALE ? DexAttr.MALE : DexAttr.FEMALE; + ret |= + this.gender === Gender.GENDERLESS + ? DexAttr.GENDERLESS + : 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);