Update check for Barb Barrage evolution move

Closes #4698
This commit is contained in:
Kurt 2026-01-23 23:41:02 -06:00
parent ad96b048b2
commit f816b06d97
2 changed files with 4 additions and 2 deletions

View File

@ -130,7 +130,7 @@ private CheckResult CheckPrimeape(LegalityAnalysis data, PKM pk, uint arg, IEnco
{
const ushort move = (ushort)Move.RageFist;
// Eager check
if (pk.HasMove(move))
if (pk.HasMove(move) || pk.HasRelearnMove(move))
return GetValid(FormArgumentValid);
var head = LearnGroupUtil.GetCurrentGroup(pk);
@ -223,7 +223,9 @@ private CheckResult CheckOverqwil(LegalityAnalysis data, PKM pk, uint arg, IEnco
if (history.HasVisitedGen9)
{
// Evolution requires only knowing the move.
if (current >= (history.HasVisitedPLA ? lowestLearnBarbBarrageHOME : 28))
const ushort move = (ushort)Move.BarbBarrage;
var hasMove = pk.HasMove(move) || pk.HasRelearnMove(move);
if (hasMove || current >= (history.HasVisitedPLA ? lowestLearnBarbBarrageHOME : 28))
{
if (arg == 0 || history.HasVisitedPLA || history.HasVisitedZA)
return GetValid(FormArgumentValid);