Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-08-27 15:24:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gb encounter move comparison

Browse Source 
don't calc NoMoveReminder for non-gen2 formats, also fix comparisons
(gen1 || gen2&&noRemind)
Closes #1707
This commit is contained in:
Kurt
2017-12-17 21:26:31 -08:00
parent 975be16c3c
commit 24b5cc48ed
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX.Core/Legality/Encounters/VerifyCurrentMoves.cs
View File

@@ -140,8 +140,8 @@ private static CheckMoveResult[] ParseMovesPre3DS(PKM pkm, int[] Moves, LegalInf
int[] SpecialMoves = GetSpecialMoves(info.EncounterMatch);
return ParseMovesIsEggPreRelearn(pkm, Moves, SpecialMoves, egg);
}
var NoMoveReminder = info.EncounterMatch is IGeneration g && (g.Generation == 1 || g.Generation == 2) && !Legal.AllowGen2MoveReminder(pkm);
if (info.Generation <= 2 && NoMoveReminder)
if (info.Generation <= 2 &&
info.EncounterMatch is IGeneration g && (g.Generation == 1 || g.Generation == 2 && !Legal.AllowGen2MoveReminder(pkm))) // fixed encounter moves without relearning
return ParseMovesGenGB(pkm, Moves, info);
if (info.EncounterMatch is EncounterEgg e)
return ParseMovesWasEggPreRelearn(pkm, Moves, info, e);

BIN
Tests/PKHeX.Tests/Legality/Legal/General/004 - CHARMANDER - D5EF.pk1 Normal file
View File

Binary file not shown.