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

unroll cxd seed completely

Browse Source 
re-letter for clearer order of RNG results, don't unroll 3x to roll
forward 2x (just unroll 1,1 then 1).

Put origin seed in RNG Reporter => frame 1 result
Closes #1169
This commit is contained in:
Kurt
2017-05-27 22:18:04 -07:00
parent 2cd1a29b76
commit db2d043199
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PKHeX.Core/Legality/Checks.cs
View File

@@ -827,20 +827,20 @@ private void verifyCXD()
private void verifyCXDStarterCorrelation(PIDIV pidiv)
{
var spec = ((EncounterStatic)EncounterMatch).Species;
int rev; // pidiv reversed 5x yields SID, 6x yields TID. shift by 7 if another PKM is generated prior
int rev; // pidiv reversed 2x yields SID, 3x yields TID. shift by 7 if another PKM is generated prior
switch (spec)
{
// XD
case 133: // Eevee
rev = 5;
rev = 2;
break;
// Colosseum
case 197: // Umbreon (generated before Espeon)
rev = 5;
rev = 2;
break;
case 196: // Espeon (generated after Umbreon)
rev = 5+7;
rev = 2+7;
break;
default:
return;

10
PKHeX.Core/Legality/RNG/MethodFinder.cs
View File

@@ -187,15 +187,13 @@ private static bool getXDRNGMatch(uint top, uint bot, uint[] IVs, out PIDIV pidi
var xdc = getSeedsFromPID(RNG.XDRNG, bot, top);
foreach (var seed in xdc)
{
var C = RNG.XDRNG.Reverse(seed, 3);
var B = RNG.XDRNG.Prev(seed);
var A = RNG.XDRNG.Prev(B);
var D = RNG.XDRNG.Next(C);
var E = RNG.XDRNG.Next(D);
if (!getIVs(D >> 16, E >> 16).SequenceEqual(IVs))
if (!getIVs(A >> 16, B >> 16).SequenceEqual(IVs))
continue;
pidiv = new PIDIV {OriginSeed = seed, RNG = RNG.XDRNG, Type = PIDType.CXD};
pidiv = new PIDIV {OriginSeed = RNG.XDRNG.Prev(A), RNG = RNG.XDRNG, Type = PIDType.CXD};
return true;
}
pidiv = null;