diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 71b21076ae6..3160978d4bd 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -649,7 +649,13 @@ export default 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); diff --git a/src/system/game-data.ts b/src/system/game-data.ts index 2949ecd51cf..3d4140b33a1 100644 --- a/src/system/game-data.ts +++ b/src/system/game-data.ts @@ -235,6 +235,7 @@ export interface RunEntry { } export const DexAttr = { + GENDERLESS: 0n, NON_SHINY: 1n, SHINY: 2n, MALE: 4n,