diff --git a/src/ui/arena-flyout.ts b/src/ui/arena-flyout.ts index 0abf1788b61..78d7ad5430e 100644 --- a/src/ui/arena-flyout.ts +++ b/src/ui/arena-flyout.ts @@ -263,8 +263,11 @@ export class ArenaFlyout extends Phaser.GameObjects.Container { for (var i = 0; i < poke.length; i++) { if (i == 1 || true) { var formtext = "" - if (poke[i].species.forms.length > 0) { - formtext = " (" + poke[i].species.forms[poke[i].formIndex].formName + ")" + if (poke[i].species.forms?.[poke[i].formIndex]?.formName) { + formtext = " (" + poke[i].species.forms?.[poke[i].formIndex]?.formName + ")" + if (formtext == " (Normal)") { + formtext = "" + } } this.flyoutTextPlayer.text += poke[i].name + formtext + " " + (poke[i].gender == Gender.MALE ? "♂" : (poke[i].gender == Gender.FEMALE ? "♀" : "-")) + " " + poke[i].level + "\n" this.flyoutTextEnemy.text += poke[i].getAbility().name + " / " + (poke[i].isBoss() ? poke[i].getPassiveAbility().name + " / " : "") + getNatureName(poke[i].nature) + (getNatureIncrease(poke[i].nature) != "" ? " (+" + getNatureIncrease(poke[i].nature) + " -" + getNatureDecrease(poke[i].nature) + ")" : "") + "\n\n\n"