From faa5a922a72e91379c21e42b16dbc2a745d9a4e9 Mon Sep 17 00:00:00 2001
From: frutescens <info@laptop>
Date: Wed, 9 Oct 2024 22:43:14 -0700
Subject: [PATCH] Add separate battler tags in move attr

---
 src/data/battler-tags.ts | 7 -------
 src/data/move.ts         | 4 +++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index 6d6fa434b11..868f05dad80 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -966,7 +966,6 @@ export class IngrainTag extends TrappedTag {
 
   override onAdd(pokemon: Pokemon) {
     super.onAdd(pokemon);
-    pokemon.addTag(BattlerTagType.IGNORE_FLYING, undefined, Moves.INGRAIN, this.sourceId);
   }
 
   /**
@@ -2692,12 +2691,6 @@ export class TelekinesisTag extends BattlerTag {
 
   override onAdd(pokemon: Pokemon)  {
     pokemon.scene.queueMessage(i18next.t("battlerTags:telekinesisOnAdd", { pokemonNameWithAffix: getPokemonNameWithAffix(pokemon) }));
-    pokemon.addTag(BattlerTagType.TELEKINESIS, 3, this.sourceMove);
-    pokemon.addTag(BattlerTagType.FLOATING, 3, this.sourceMove);
-  }
-
-  override onRemove(pokemon: Pokemon) {
-    pokemon.removeTag(BattlerTagType.FLOATING);
   }
 }
 
diff --git a/src/data/move.ts b/src/data/move.ts
index 94a8a12f16f..fbc69b5ce3c 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -7828,6 +7828,7 @@ export function initMoves() {
       .ignoresVirtual(),
     new SelfStatusMove(Moves.INGRAIN, Type.GRASS, -1, 20, -1, 0, 3)
       .attr(AddBattlerTagAttr, BattlerTagType.INGRAIN, true, true)
+      .attr(AddBattlerTagAttr, BattlerTagType.IGNORE_FLYING, true, true)
       .attr(RemoveBattlerTagAttr, [ BattlerTagType.FLOATING ], true),
     new AttackMove(Moves.SUPERPOWER, Type.FIGHTING, MoveCategory.PHYSICAL, 120, 100, 5, -1, 0, 3)
       .attr(StatStageChangeAttr, [ Stat.ATK, Stat.DEF ], -1, true),
@@ -8391,7 +8392,8 @@ export function initMoves() {
       .condition((_user, target, _move) => ![ Species.DIGLETT, Species.DUGTRIO, Species.ALOLA_DIGLETT, Species.ALOLA_DUGTRIO, Species.SANDYGAST, Species.PALOSSAND, Species.WIGLETT, Species.WUGTRIO ].includes(target.species.speciesId))
       .condition((_user, target, _move) => !(target.species.speciesId === Species.GENGAR && target.getFormKey() === "mega"))
       .condition((_user, target, _move) => Utils.isNullOrUndefined(target.getTag(BattlerTagType.INGRAIN)) && Utils.isNullOrUndefined(target.getTag(BattlerTagType.IGNORE_FLYING)))
-      .attr(AddBattlerTagAttr, BattlerTagType.TELEKINESIS, false, false, 3),
+      .attr(AddBattlerTagAttr, BattlerTagType.TELEKINESIS, false, true, 3)
+      .attr(AddBattlerTagAttr, BattlerTagType.FLOATING, false, true, 3),
     new StatusMove(Moves.MAGIC_ROOM, Type.PSYCHIC, -1, 10, -1, 0, 5)
       .ignoresProtect()
       .target(MoveTarget.BOTH_SIDES)