Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove

Fixed Z-Move not being cleared if Pokémon faints
rh-hideout · Oct 16, 2022 · e3f37ad · e3f37ad
2 parents 068422b + dd2d610
commit e3f37ad
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/battle_main.c b/src/battle_main.c
@@ -3303,6 +3303,11 @@ void FaintClearSetData(void)
             }
         }
     }
+
+    // Clear Z-Move data
+    gBattleStruct->zmove.active = FALSE;
+    gBattleStruct->zmove.toBeUsed[gActiveBattler] = MOVE_NONE;
+    gBattleStruct->zmove.effect = EFFECT_HIT;
 }
 
 static void DoBattleIntro(void)