From 85b47be0b81165a458c1ccd48fc1e825c9a16988 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 19 Apr 2024 09:03:14 -0400 Subject: [PATCH] Fix battle info owned icon not factoring in ability --- src/ui/battle-info.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index 46b0057970f..b4968f26b1d 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -80,7 +80,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.ownedIcon = this.scene.add.sprite(0, 0, 'icon_owned'); this.ownedIcon.setVisible(false); this.ownedIcon.setOrigin(0, 0); - this.ownedIcon.setPositionRelative(this.nameText, 0, 11.5); + this.ownedIcon.setPositionRelative(this.nameText, 0, 11.75); this.add(this.ownedIcon); } @@ -197,7 +197,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const dexEntry = pokemon.scene.gameData.dexData[pokemon.species.speciesId]; this.ownedIcon.setVisible(!!dexEntry.caughtAttr); const dexAttr = pokemon.getDexAttr(); - if ((dexEntry.caughtAttr & dexAttr) < dexAttr) + if ((dexEntry.caughtAttr & dexAttr) < dexAttr || !(pokemon.scene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr & Math.pow(2, pokemon.abilityIndex))) this.ownedIcon.setTint(0x808080); if (this.boss)