Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-06 13:40:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add missing learn/personal references for pairs

Browse Source 
Closes #2019
This commit is contained in:
Kurt 2018-06-17 20:49:03 -07:00
parent 9a0ddf1f5e
commit 33eded08d1
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PKHeX.Core/Game/GameData.cs
View File

@ -51,9 +51,13 @@ public static class GameData
{ GameVersion.GS, Legal.LevelUpGS },
{ GameVersion.GSC, Legal.LevelUpC },
{ GameVersion.RS, Legal.LevelUpRS },
{ GameVersion.RSE, Legal.LevelUpRS },
{ GameVersion.FRLG, Legal.LevelUpE },
{ GameVersion.CXD, Legal.LevelUpE },
{ GameVersion.COLO, Legal.LevelUpE },
{ GameVersion.XD, Legal.LevelUpE },
{ GameVersion.DP, Legal.LevelUpDP },
{ GameVersion.DPPt, Legal.LevelUpDP },
{ GameVersion.HGSS, Legal.LevelUpHGSS },
{ GameVersion.BW, Legal.LevelUpBW },
{ GameVersion.B2W2, Legal.LevelUpB2W2 },
@ -115,9 +119,13 @@ public static class GameData
{ GameVersion.GS, PersonalTable.GS },
{ GameVersion.GSC, PersonalTable.C },
{ GameVersion.RS, PersonalTable.RS },
{ GameVersion.RSE, PersonalTable.RS },
{ GameVersion.FRLG, PersonalTable.E },
{ GameVersion.CXD, PersonalTable.E },
{ GameVersion.COLO, PersonalTable.E },
{ GameVersion.XD, PersonalTable.E },
{ GameVersion.DP, PersonalTable.DP },
{ GameVersion.DPPt, PersonalTable.DP },
{ GameVersion.HGSS, PersonalTable.HGSS },
{ GameVersion.BW, PersonalTable.BW },
{ GameVersion.B2W2, PersonalTable.B2W2 },

2
PKHeX.Core/Legality/Analysis.cs
View File

@ -366,7 +366,7 @@ public int[] GetSuggestedMoves(bool tm, bool tutor, bool reminder)
if (!(tm || tutor || reminder))
{
var lvl = Info.Generation <= 2 && pkm.Format >= 7 ? pkm.Met_Level : pkm.CurrentLevel;
var ver = EncounterOriginal is IVersion v ? v.Version : (GameVersion)pkm.Version;
var ver = Info.Generation <= 2 && EncounterOriginal is IVersion v ? v.Version : (GameVersion)pkm.Version;
return MoveLevelUp.GetEncounterMoves(pkm, lvl, ver);
}
var evos = Info.EvoChainsAllGens;

2
PKHeX.Core/Legality/Moves/MoveLevelUp.cs
View File

@ -426,6 +426,8 @@ public static int[] GetEncounterMoves(PKM pk, int level, GameVersion version)
{
if (RBY.Contains(version))
return GetEncounterMoves1(pk.Species, level, version);
if (version <= 0)
version = (GameVersion)pk.Version;
return GetEncounterMoves(pk.Species, pk.AltForm, level, version);
}