Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-05-14 16:10:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorder case fallthrough

Browse Source 
closes #1631
based on
5859daf1d8
any case -> reverse game order
This commit is contained in:
Kurt 2017-11-19 13:15:32 -08:00
parent 1b9d657c2f
commit 6d3ee54d44
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PKHeX.Core/Legality/Core.cs
View File

@ -367,7 +367,6 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
case 7:
switch (ver)
{
case GameVersion.Any:
case GameVersion.SN:
case GameVersion.MN:
case GameVersion.SM:
@ -376,10 +375,9 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
break;
int index = PersonalTable.SM.GetFormeIndex(species, form);
r.AddRange(LevelUpSM[index].GetMoves(lvl));
if (ver == GameVersion.Any) // Fall Through
goto case GameVersion.USUM;
break;
}
case GameVersion.Any:
case GameVersion.US:
case GameVersion.UM:
case GameVersion.USUM:
@ -388,6 +386,8 @@ private static IEnumerable<int> GetLvlMoves(int species, int form, int Generatio
if (index == 0)
return r;
r.AddRange(LevelUpUSUM[index].GetMoves(lvl));
if (ver == GameVersion.Any) // Fall Through
goto case GameVersion.SM;
break;
}
}
@ -1937,7 +1937,6 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
case 7:
switch (ver)
{
case GameVersion.Any:
case GameVersion.SN: case GameVersion.MN: case GameVersion.SM:
{
if (species > MaxSpeciesID_7)
@ -1955,10 +1954,9 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
PersonalInfo pi = PersonalTable.SM.GetFormeEntry(species, form);
r.AddRange(TMHM_SM.Where((t, m) => pi.TMHM[m]));
}
if (ver == GameVersion.Any) // Fall Through
goto case GameVersion.USUM;
break;
}
case GameVersion.Any:
case GameVersion.US: case GameVersion.UM: case GameVersion.USUM:
{
int index = PersonalTable.USUM.GetFormeIndex(species, form);
@ -1974,6 +1972,8 @@ private static IEnumerable<int> GetMoves(PKM pkm, int species, int minlvlG1, int
PersonalInfo pi = PersonalTable.USUM.GetFormeEntry(species, form);
r.AddRange(TMHM_SM.Where((t, m) => pi.TMHM[m]));
}
if (ver == GameVersion.Any) // Fall Through
goto case GameVersion.SM;
break;
}
}