From fa7c1684f7deb5bcfe0f01ed91f7ffc01d31b2eb Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Fri, 29 Mar 2024 15:43:36 -0400
Subject: [PATCH] Fix tag source linking

---
 src/data/battler-tags.ts    | 4 ++++
 src/data/splash-messages.ts | 1 +
 src/field/pokemon.ts        | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

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 {