From 3872d6fb187a76e4a28f239921104099ddb81110 Mon Sep 17 00:00:00 2001 From: Jon Studders Date: Fri, 17 May 2024 13:53:16 +0100 Subject: [PATCH] Fixed Merge. --- src/ui/battle-info.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index dc34b9592e5..669c35ce0e8 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -270,7 +270,12 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.ownedIcon.setVisible(!!dexEntry.caughtAttr); const opponentPokemonDexAttr = pokemon.getDexAttr(); - if ((dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr || !(pokemon.scene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr & Math.pow(2, pokemon.abilityIndex))) + if ((dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr || !(pokemon.scene.gameData.starterData[pokemon.species.getRootSpeciesId()].abilityAttr & Math.pow(2, pokemon.abilityIndex))) { + if (!dexEntry.caughtAttr) { + this.championRibbon.setPositionRelative(this.nameText, 0, 11.75); + } + this.championRibbon.setVisible(true); + } // Check if Player owns all genders and forms of the Pokemon const missingDexAttrs = ((dexEntry.caughtAttr & opponentPokemonDexAttr) < opponentPokemonDexAttr);