From fa68aa7a2953f7fa0eb218a6040f083fe09d2973 Mon Sep 17 00:00:00 2001
From: Kaphotics <kaphotics@gmail.com>
Date: Mon, 21 Mar 2016 23:43:03 -0700
Subject: [PATCH] Minor fixes

Fix ribbon bits, fix formchange
---
 Legality/Checks.cs | 6 +++---
 Legality/Core.cs   | 2 +-
 Legality/Tables.cs | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Legality/Checks.cs b/Legality/Checks.cs
index 99f95b0b5..e2ac2bd85 100644
--- a/Legality/Checks.cs
+++ b/Legality/Checks.cs
@@ -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
diff --git a/Legality/Core.cs b/Legality/Core.cs
index 3da749bd0..51fa2541e 100644
--- a/Legality/Core.cs
+++ b/Legality/Core.cs
@@ -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++)
diff --git a/Legality/Tables.cs b/Legality/Tables.cs
index c78aa8b72..bbab0ae68 100644
--- a/Legality/Tables.cs
+++ b/Legality/Tables.cs
@@ -431,5 +431,11 @@
             676, // Furfrou
             720, // Hoopa
         };
+        internal static readonly int[] FormChangeMoves =
+        {
+            386, // Deoxys
+            487, // Giratina
+            492, // Shaymin
+        };
     }
 }