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

Fixed Z-Move not being cleared if Pokémon faints
This commit is contained in:
ghoulslash authored and GitHub committed 2022-10-16 09:27:23 -04:00
commit e3f37ad825
1 file changed
+5
+5
View File
@@ -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)