mirror of
https://github.com/kwsch/PKHeX.git
synced 2026-10-02 12:06:47 -05:00
Add maxspecies checks for gen7
accesses arrays outside the range for the new USUM species Closes #1631 , add test case also adds lycanroc test cases for #1630
This commit is contained in:
@@ -372,6 +372,8 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
|
||||
case GameVersion.MN:
|
||||
case GameVersion.SM:
|
||||
{
|
||||
if (species > MaxSpeciesID_7)
|
||||
break;
|
||||
int index = PersonalTable.SM.GetFormeIndex(species, form);
|
||||
r.AddRange(LevelUpSM[index].GetMoves(lvl));
|
||||
if (ver == GameVersion.Any) // Fall Through
|
||||
@@ -550,6 +552,8 @@ internal static int[] GetBaseEggMoves(PKM pkm, int species, GameVersion gameSour
|
||||
case GameVersion.SN:
|
||||
case GameVersion.MN:
|
||||
case GameVersion.SM:
|
||||
if (species > MaxSpeciesID_7)
|
||||
break;
|
||||
if (pkm.InhabitedGeneration(7))
|
||||
{
|
||||
int index = PersonalTable.SM.GetFormeIndex(species, pkm.AltForm);
|
||||
@@ -1603,6 +1607,8 @@ private static IEnumerable<int> GetRelearnLVLMoves(PKM pkm, int species, int lvl
|
||||
return getMoves(LevelUpAO, PersonalTable.AO);
|
||||
|
||||
case GameVersion.SN: case GameVersion.MN:
|
||||
if (species > MaxSpeciesID_7)
|
||||
break;
|
||||
return getMoves(LevelUpSM, PersonalTable.SM);
|
||||
case GameVersion.US: case GameVersion.UM:
|
||||
return getMoves(LevelUpUSUM, PersonalTable.USUM);
|
||||
@@ -1934,6 +1940,8 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
|
||||
case GameVersion.Any:
|
||||
case GameVersion.SN: case GameVersion.MN: case GameVersion.SM:
|
||||
{
|
||||
if (species > MaxSpeciesID_7)
|
||||
break;
|
||||
int index = PersonalTable.SM.GetFormeIndex(species, form);
|
||||
if (MoveReminder)
|
||||
lvl = 100; // Move reminder can teach any level in movepool now!
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user