Misc tweaks

no functional change
This commit is contained in:
Kurt 2017-04-08 11:08:16 -07:00
parent 6ff4003036
commit f430e2feee
2 changed files with 9 additions and 5 deletions

View File

@ -2713,7 +2713,7 @@ internal static IEnumerable<int> getTMHM(PKM pkm, int species, int form, int gen
var pi_c = (PersonalInfoG2)PersonalTable.C[index];
moves.AddRange(TMHM_GSC.Where((t, m) => pi_c.TMHM[m]));
if (Version == GameVersion.Any)
goto case 1;
goto case 1; // rby
break;
case 3:
index = PersonalTable.E.getFormeIndex(species, 0);
@ -2790,15 +2790,19 @@ internal static IEnumerable<int> getTMHM(PKM pkm, int species, int form, int gen
index = PersonalTable.AO.getFormeIndex(species, form);
if (index == 0)
return moves;
PersonalInfo pi_oras = PersonalTable.AO[index];
moves.AddRange(TMHM_AO.Where((t, m) => pi_oras.TMHM[m]));
PersonalInfo pi_ao = PersonalTable.AO[index];
moves.AddRange(TMHM_AO.Where((t, m) => pi_ao.TMHM[m]));
break;
}
}
break;
case 7:
index = PersonalTable.SM.getFormeIndex(species, form);
PersonalInfo pi_sm = PersonalTable.SM.getFormeEntry(species, form);
if (index == 0)
return moves;
PersonalInfo pi_sm = PersonalTable.SM[index];
moves.AddRange(TMHM_SM.Where((t, m) => pi_sm.TMHM[m]));
break;
}

View File

@ -1,5 +1,5 @@
148 Starter 00:Rowlet,01:Litten,02:Popplio
432 Tapu Koku 03:Battleable,04:Defeated,05:Captured
432 Tapu Koko 03:Battleable,04:Defeated,05:Captured
433 Tapu Lele 01:Battleable,02:Defeated,03:Captured
434 Tapu Bulu 01:Battleable,02:Defeated,03:Captured
404 Tapu Fini 03:Battleable,04:Defeated,05:Captured