Minor fixes

Fix ribbon bits, fix formchange
This commit is contained in:
Kaphotics 2016-03-21 23:43:03 -07:00
parent 903f070e61
commit fa68aa7a29
3 changed files with 10 additions and 4 deletions

View file

@ -280,11 +280,11 @@ namespace PKHeX
invalidRibbons.Add("GBA Champion"); // RSE HoF
if (pk6.RIB0_2)
invalidRibbons.Add("Sinnoh Champ"); // DPPt HoF
if (pk6.RIB1_2)
if (pk6.RIB2_2)
invalidRibbons.Add("Artist"); // RSE Master Rank Portrait
if (pk6.RIB1_4)
if (pk6.RIB2_4)
invalidRibbons.Add("Record"); // Unobtainable
if (pk6.RIB1_5)
if (pk6.RIB2_5)
invalidRibbons.Add("Legend"); // HGSS Defeat Red @ Mt.Silver
if (pk6.Memory_ContestCount > 0)
invalidRibbons.Add("Contest Memory"); // Gen3/4 Contest

View file

@ -102,7 +102,7 @@ namespace PKHeX
{
List<int> r = new List<int> {0};
int species = pk6.Species;
if (FormChange.Contains(species)) // Deoxys & Shaymin & Giratina (others don't have extra but whatever)
if (FormChangeMoves.Contains(species)) // Deoxys & Shaymin & Giratina (others don't have extra but whatever)
{
int formcount = PersonalAO[species].FormeCount;
for (int i = 0; i < formcount; i++)

View file

@ -431,5 +431,11 @@
676, // Furfrou
720, // Hoopa
};
internal static readonly int[] FormChangeMoves =
{
386, // Deoxys
487, // Giratina
492, // Shaymin
};
}
}