Fix Keldeo Secret Sword

Legality/Checks.cs

@@ -255,8 +255,8 @@ namespace PKHeX
 
 
             if (pk6.Species == 647) // Keldeo
-                if (pk6.AltForm == 1 ^ pk6.Moves.Contains(533))
-                    res[0] = new LegalityCheck(Severity.Invalid, "Sacred Sword / Resolute Keldeo Mismatch.");
+                if (pk6.AltForm == 1 ^ pk6.Moves.Contains(548))
+                    res[0] = new LegalityCheck(Severity.Invalid, "Secret Sword / Resolute Keldeo Mismatch.");
 
             // Duplicate Moves Check
             for (int i = 0; i < 4; i++)

Legality/Core.cs

@@ -201,8 +201,7 @@ namespace PKHeX
         }
         internal static int getFriendSafariValid(PK6 pk6)
         {
-            int vers = pk6.Version;
-            if (vers != 24 && vers != 25)
+            if (!pk6.XY)
                 return -1;
             IEnumerable<DexLevel> vs = getValidPreEvolutions(pk6);
             foreach (DexLevel d in vs.Where(d => FriendSafari.Contains(d.Species) && d.Level >= 30))
@@ -215,7 +214,7 @@ namespace PKHeX
             int species = getBaseSpecies(pk6, skipOption);
             if (gameSource == -1)
             {
-                if (pk6.Version == 24 || pk6.Version == 25)
+                if (pk6.XY)
                     return LevelUpXY[species].getMoves(1);
                 // if (pk6.Version == 26 || pk6.Version == 27)
                     return LevelUpAO[species].getMoves(1);
@@ -410,6 +409,9 @@ namespace PKHeX
                     if (pkAO.ORASTutors[i][b])
                         moves.Add(Tutors_AO[i][b]);
 
+            // Keldeo - Secret Sword
+            if (species == 647)
+                moves.Add(548);
             return moves;
         }
         private static IEnumerable<int> getMachineMoves(int species, int formnum)

Resources/text/changelog.txt

@@ -652,7 +652,7 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Fixed: 4->6 Import ability transferring. Thanks zero2exe!
  - Removed: ram2sav support. If you wish to still use ram2sav, use a compiled version from 9/20/15 or earlier.
 
-03/19/16 - New Update:
+03/19/16 - New Update: (770)
  - Added: Legality checking for XY/ORAS origin Pokémon.
  - - Legality indication next to moves and Preview to indicate the legality of the loaded pk6.
  - - Legality indication click event to pop up why the pk6 is flagged as illegal.
@@ -675,4 +675,5 @@ http://projectpokemon.org/forums/showthread.php?36986
  - Changed: PID generator for Gen3/4/Unown legal PIDs. Thanks chenzw95!
  - Changed: Chinese Translation updated. Thanks easyworld!
  - Changed: Startup times of the program may be quicker.
- - Hotfix: Added missing Lost Hotel & Soaring static encounters. Thanks froslumugu & \!
+ - Hotfix: Added missing Lost Hotel & Soaring static encounters. Thanks froslumugu & \!
+ - Hotfix: Keldeo Secret Sword detection.