Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 14:30:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove pkm personalinfo reference

Browse source 
Gen7 bits were shuffled relative to gen6, so fetching gen6 with gen7
bitflags will yield the wrong tutor moves.
This commit is contained in:
Kurt 2017-02-27 18:22:28 -08:00
parent a1e0ed020e
commit ea518e2ece
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX/Legality/Core.cs
View file

@ -1277,7 +1277,7 @@ namespace PKHeX.Core
slotMax = slotMax.Clone();
slotMax.Pressure = true;
slotMax.Form = pkm.AltForm;
};
}
if (gen >= 6 && !DexNav)
{
@ -1557,7 +1557,7 @@ namespace PKHeX.Core
private static IEnumerable<int> getTutorMoves(PKM pkm, int species, int form, bool specialTutors, int generation)
{
List<int> moves = new List<int>();
PersonalInfo info = pkm.PersonalInfo;
PersonalInfo info;
switch (generation)
{
case 1:
@ -1576,6 +1576,7 @@ namespace PKHeX.Core
// // moves.Add(Tutors_B2W2[i][b]);
//}
case 6:
info = PersonalTable.AO[species];
moves.AddRange(TypeTutor6.Where((t, i) => info.TypeTutors[i]));
if ( pkm.InhabitedGeneration(6) && specialTutors && (pkm.AO || !pkm.IsUntraded))
{
@ -1587,6 +1588,7 @@ namespace PKHeX.Core
}
break;
case 7:
info = PersonalTable.SM[species];
// Type Tutors -- Pledge moves and High BP moves switched places in G7+
moves.AddRange(TypeTutor7.Where((t, i) => info.TypeTutors[i]));
// No special tutors in G7