From e45cb42f7ee86899e45d9aa40aa390b65251dd76 Mon Sep 17 00:00:00 2001
From: innerthunder <168692175+innerthunder@users.noreply.github.com>
Date: Tue, 12 Nov 2024 18:42:47 -0800
Subject: [PATCH 1/2] [Balance] Disable King's Rock for moves that can already
 flinch (#4860)

---
 src/phases/move-effect-phase.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/phases/move-effect-phase.ts b/src/phases/move-effect-phase.ts
index 24a0b51da96..afc8dd0475d 100644
--- a/src/phases/move-effect-phase.ts
+++ b/src/phases/move-effect-phase.ts
@@ -26,6 +26,7 @@ import {
   applyMoveAttrs,
   AttackMove,
   DelayedAttackAttr,
+  FlinchAttr,
   HitsTagAttr,
   MissEffectAttr,
   MoveAttr,
@@ -502,6 +503,10 @@ export class MoveEffectPhase extends PokemonPhase {
    */
   protected applyHeldItemFlinchCheck(user: Pokemon, target: Pokemon, dealsDamage: boolean) : () => void {
     return () => {
+      if (this.move.getMove().hasAttr(FlinchAttr)) {
+        return;
+      }
+
       if (dealsDamage && !target.hasAbilityWithAttr(IgnoreMoveEffectsAbAttr) && !this.move.getMove().hitsSubstitute(user, target)) {
         const flinched = new BooleanHolder(false);
         user.scene.applyModifiers(FlinchChanceModifier, user.isPlayer(), user, flinched);

From 162eea500dcfaa5e39b06481339a60ebfb2d0c78 Mon Sep 17 00:00:00 2001
From: muscode <mmustafafareed@hotmail.com>
Date: Wed, 13 Nov 2024 00:28:22 -0600
Subject: [PATCH 2/2] Fixed wild form changes messages, and form-changed
 Cramorant crashing the game when both sides faint at the same time  (#4859)

---
 src/phases/quiet-form-change-phase.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/phases/quiet-form-change-phase.ts b/src/phases/quiet-form-change-phase.ts
index c28cc28b592..6c84c0d1a8a 100644
--- a/src/phases/quiet-form-change-phase.ts
+++ b/src/phases/quiet-form-change-phase.ts
@@ -29,10 +29,14 @@ export class QuietFormChangePhase extends BattlePhase {
 
     const preName = getPokemonNameWithAffix(this.pokemon);
 
-    if (!this.pokemon.isOnField() || this.pokemon.getTag(SemiInvulnerableTag)) {
-      this.pokemon.changeForm(this.formChange).then(() => {
-        this.scene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), 1500);
-      });
+    if (!this.pokemon.isOnField() || this.pokemon.getTag(SemiInvulnerableTag) || this.pokemon.isFainted()) {
+      if (this.pokemon.isPlayer() || this.pokemon.isActive()) {
+        this.pokemon.changeForm(this.formChange).then(() => {
+          this.scene.ui.showText(getSpeciesFormChangeMessage(this.pokemon, this.formChange, preName), null, () => this.end(), 1500);
+        });
+      } else {
+        this.end();
+      }
       return;
     }