Merge 1f5f228c80 into 46c78a0540

Bringing mon icon overlays on top correctly

src/data/pokemon-species.ts

@@ -778,7 +778,7 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
       }
 
       if (key) {
-        return i18next.t(`battlePokemonForm:${key}`, {
+        return i18next.t(`battlePokemonForm:${toCamelCase(key)}`, {
           pokemonName: this.name,
         });
       }
@@ -841,7 +841,7 @@ export class PokemonSpecies extends PokemonSpeciesForm implements Localizable {
       ].includes(formKey as SpeciesFormKey)
     ) {
       return append
-        ? i18next.t(`battlePokemonForm:${formKey}`, { pokemonName: this.name })
+        ? i18next.t(`battlePokemonForm:${toCamelCase(formKey)}`, { pokemonName: this.name })
         : i18next.t(`pokemonForm:battleForm.${formKey}`);
     } else if (
       region === Region.NORMAL ||

src/ui/pokedex-mon-container.ts

@@ -208,6 +208,26 @@ export class PokedexMonContainer extends Phaser.GameObjects.Container {
     );
     this.checkIconId(defaultProps.female, defaultProps.formIndex, defaultProps.shiny, defaultProps.variant);
     this.add(this.icon);
+
+    [
+      this.hiddenAbilityIcon,
+      this.favoriteIcon,
+      this.classicWinIcon,
+      this.candyUpgradeIcon,
+      this.candyUpgradeOverlayIcon,
+      this.eggMove1Icon,
+      this.tmMove1Icon,
+      this.eggMove2Icon,
+      this.tmMove2Icon,
+      this.passive1Icon,
+      this.passive2Icon,
+      this.passive1OverlayIcon,
+      this.passive2OverlayIcon,
+    ].forEach(icon => {
+      if (icon) {
+        this.bringToTop(icon);
+      }
+    });
   }
 
   checkIconId(female, formIndex, shiny, variant) {