diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index 512c7a4b634..f9234d7c25c 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -34,7 +34,7 @@ export function getFusedSpeciesName(speciesAName: string, speciesBName: string): if (fragBMatch) { const lastCharA = fragA.slice(fragA.length - 1); const prevCharB = fragBMatch[1].slice(fragBMatch.length - 1); - fragB = (/[\-']/.test(prevCharB) || /[aeiou]/i.test(lastCharA) ? prevCharB : '') + fragBMatch[2] || prevCharB; + fragB = (/[\-']/.test(prevCharB) ? prevCharB : '') + fragBMatch[2] || prevCharB; if (lastCharA === fragB[0] && /[aiu]/.test(lastCharA)) fragB = fragB.slice(1); } else diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index d79727fa430..420fdd8d948 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -180,6 +180,8 @@ export default class BattleInfo extends Phaser.GameObjects.Container { const offsetElements = [ this.nameText, this.genderText, this.statusIndicator, this.levelContainer ]; offsetElements.forEach(el => el.y += 1.5 * (mini ? -1 : 1)); + this.shinyIcon.setPositionRelative(this.levelContainer, -12, -5); + const toggledElements = [ this.hpNumbersContainer, this.expBar ]; toggledElements.forEach(el => el.setVisible(!mini)); }