Load evolves 3 to 5

This commit is contained in:
javierhimura 2017-03-19 13:33:20 +01:00
parent 994a6844aa
commit 2cf81deed1
2 changed files with 6 additions and 10 deletions

View file

@ -278,7 +278,7 @@ namespace PKHeX.Core
SlotsFR = getEncounterTables(GameVersion.FR);
SlotsLG = getEncounterTables(GameVersion.LG);
//Evolves3 = new EvolutionTree(Data.unpackMini(Resources.evos_rs, "rs"), GameVersion.RS, PersonalTable.RS, MaxSpeciesID_3);
Evolves3 = new EvolutionTree(new[] { Resources.evos_g3 }, GameVersion.RS, PersonalTable.RS, MaxSpeciesID_3);
// Update Personal Entries with TM/Tutor Data
var TMHM = Data.unpackMini(Resources.hmtm_g3, "g3");
@ -302,7 +302,7 @@ namespace PKHeX.Core
SlotsHG = getEncounterTables(GameVersion.HG);
SlotsSS = getEncounterTables(GameVersion.SS);
//Evolves4 = new EvolutionTree(Data.unpackMini(Resources.evos_dp, "dp"), GameVersion.DP, PersonalTable.DP, MaxSpeciesID_4);
Evolves4 = new EvolutionTree(new[] { Resources.evos_g4 }, GameVersion.DP, PersonalTable.DP, MaxSpeciesID_4);
// Update Personal Entries with Tutor Data
var tutors = Data.unpackMini(Resources.tutors_g4, "g4");
@ -325,7 +325,7 @@ namespace PKHeX.Core
MarkG5Slots(ref SlotsB2);
MarkG5Slots(ref SlotsW2);
//Evolves5 = new EvolutionTree(Data.unpackMini(Resources.evos_bw, "bw"), GameVersion.BW, PersonalTable.BW, MaxSpeciesID_5);
Evolves5 = new EvolutionTree(new[] { Resources.evos_g5 }, GameVersion.BW, PersonalTable.BW, MaxSpeciesID_5);
}
// Gen 6
{
@ -363,10 +363,6 @@ namespace PKHeX.Core
Evolves7 = new EvolutionTree(Data.unpackMini(Resources.evos_sm, "sm"), GameVersion.SM, PersonalTable.SM, MaxSpeciesID_7);
}
// Temp
Evolves3 = Evolves4 = Evolves5 = Evolves6;
}
// Moves

View file

@ -25,13 +25,13 @@ namespace PKHeX.Core
case GameVersion.GSC:
Entries = EvolutionSet2.getArray(data[0], maxSpeciesTree);
break;
case GameVersion.E:
case GameVersion.RS:
Entries = EvolutionSet3.getArray(data[0]);
break;
case GameVersion.Pt:
case GameVersion.DP:
Entries = EvolutionSet4.getArray(data[0]);
break;
case GameVersion.B2W2:
case GameVersion.BW:
Entries = EvolutionSet5.getArray(data[0]);
break;
case GameVersion.ORAS: