diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index c0df2a6eb..1d8583b55 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -250,6 +250,10 @@ export class InfatuatedTag extends BattlerTag { pokemon.scene.queueMessage(getPokemonMessage(pokemon, ' got over\nits infatuation.')); } + isSourceLinked(): boolean { + return true; + } + getDescriptor(): string { return 'infatuation'; } diff --git a/src/data/splash-messages.ts b/src/data/splash-messages.ts index 298a2f9f5..c68b68c98 100644 --- a/src/data/splash-messages.ts +++ b/src/data/splash-messages.ts @@ -1,6 +1,7 @@ export const splashMessages = [ 'Join the Discord!', 'Infinite Levels!', + 'Everything Stacks!', 'Optional Save Scumming!', '35 Biomes!', 'Open Source!', diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 981970ed2..84c0250ca 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1366,7 +1366,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { } removeTagsBySourceId(sourceId: integer): void { - this.findAndRemoveTags(t => t.sourceId === sourceId); + this.findAndRemoveTags(t => t.isSourceLinked() && t.sourceId === sourceId); } transferTagsBySourceId(sourceId: integer, newSourceId: integer): void {