From 6939034cfaeebb07ca563a1cc12618fa4362a518 Mon Sep 17 00:00:00 2001
From: frutescens <info@laptop>
Date: Fri, 20 Sep 2024 15:38:11 -0700
Subject: [PATCH] Implemented Psychic Noise

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

diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts
index c907b60b820..a39234668e1 100644
--- a/src/data/battler-tags.ts
+++ b/src/data/battler-tags.ts
@@ -2186,8 +2186,8 @@ export class ExposedTag extends BattlerTag {
  * Describes the behavior of a Heal Block Tag.
  */
 export class HealBlockTag extends MoveRestrictionBattlerTag {
-  constructor() {
-    super(BattlerTagType.HEAL_BLOCK, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], 5, Moves.HEAL_BLOCK);
+  constructor(turnCount: number, sourceMove: Moves) {
+    super(BattlerTagType.HEAL_BLOCK, [ BattlerTagLapseType.PRE_MOVE, BattlerTagLapseType.TURN_END ], turnCount, sourceMove);
   }
 
   override onAdd(pokemon: Pokemon): void {
@@ -2552,7 +2552,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
   case BattlerTagType.MYSTERY_ENCOUNTER_POST_SUMMON:
     return new MysteryEncounterPostSummonTag();
   case BattlerTagType.HEAL_BLOCK:
-    return new HealBlockTag();
+    return new HealBlockTag(turnCount, sourceMove);
   case BattlerTagType.NONE:
   default:
     return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
diff --git a/src/data/move.ts b/src/data/move.ts
index 530d78cc698..a2ed156b519 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -4540,6 +4540,7 @@ export class AddBattlerTagAttr extends MoveEffectAttr {
     case BattlerTagType.NIGHTMARE:
     case BattlerTagType.DROWSY:
     case BattlerTagType.DISABLED:
+    case BattlerTagType.HEAL_BLOCK:
       return -5;
     case BattlerTagType.SEEDED:
     case BattlerTagType.SALT_CURED:
@@ -7827,7 +7828,7 @@ export function initMoves() {
       .makesContact()
       .attr(LessPPMorePowerAttr),
     new StatusMove(Moves.HEAL_BLOCK, Type.PSYCHIC, 100, 15, -1, 0, 4)
-      .attr(AddBattlerTagAttr, BattlerTagType.HEAL_BLOCK, false, false, 5)
+      .attr(AddBattlerTagAttr, BattlerTagType.HEAL_BLOCK, false, true, 5)
       .target(MoveTarget.ALL_NEAR_ENEMIES),
     new AttackMove(Moves.WRING_OUT, Type.NORMAL, MoveCategory.SPECIAL, -1, 100, 5, -1, 0, 4)
       .attr(OpponentHighHpPowerAttr, 120)