Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-11 07:04:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix antishiny 3-5=>6+ check

Browse source 
uint SID = Util.ToUInt32(TB_TID.Text);
uint TID = Util.ToUInt32(TB_TID.Text);
first line should have been TB_SID.Text not TID

pull out method

Thanks wejhvabewjty!

https://projectpokemon.org/forums/forums/topic/41110-problem-with-pok%C3%A9mon-caught-w-cute-charm-lead/
This commit is contained in:
Kurt 2017-07-15 09:48:08 -07:00
parent 2f3c56e7c5
commit 569873701b
3 changed files with 29 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
PKHeX.WinForms/Controls/PKM Editor/EditPK6.cs
View file

@ -150,29 +150,7 @@ namespace PKHeX.WinForms.Controls
return null; return null;
// Repopulate PK6 with Edited Stuff // Repopulate PK6 with Edited Stuff
if (WinFormsUtil.GetIndex(CB_GameOrigin) < 24) CheckTransferPIDValid();
{
uint EC = Util.GetHexValue(TB_EC.Text);
uint PID = Util.GetHexValue(TB_PID.Text);
uint SID = Util.ToUInt32(TB_TID.Text);
uint TID = Util.ToUInt32(TB_TID.Text);
uint LID = PID & 0xFFFF;
uint HID = PID >> 16;
uint XOR = TID ^ LID ^ SID ^ HID;
// Ensure we don't have a shiny.
if (XOR >> 3 == 1) // Illegal, fix. (not 16<XOR>=8)
{
// Keep as shiny, so we have to mod the PID
PID ^= XOR;
TB_PID.Text = PID.ToString("X8");
TB_EC.Text = PID.ToString("X8");
}
else if ((XOR ^ 0x8000) >> 3 == 1 && PID != EC)
TB_EC.Text = (PID ^ 0x80000000).ToString("X8");
else // Not Illegal, no fix.
TB_EC.Text = PID.ToString("X8");
}
pk6.EncryptionConstant = Util.GetHexValue(TB_EC.Text); pk6.EncryptionConstant = Util.GetHexValue(TB_EC.Text);
pk6.Checksum = 0; // 0 CHK for now pk6.Checksum = 0; // 0 CHK for now

27
PKHeX.WinForms/Controls/PKM Editor/EditPK7.cs
View file

@ -149,30 +149,8 @@ namespace PKHeX.WinForms.Controls
if (pk7 == null) if (pk7 == null)
return null; return null;
// Repopulate PK6 with Edited Stuff // Repopulate PK7 with Edited Stuff
if (WinFormsUtil.GetIndex(CB_GameOrigin) < 24) CheckTransferPIDValid();
{
uint EC = Util.GetHexValue(TB_EC.Text);
uint PID = Util.GetHexValue(TB_PID.Text);
uint SID = Util.ToUInt32(TB_TID.Text);
uint TID = Util.ToUInt32(TB_TID.Text);
uint LID = PID & 0xFFFF;
uint HID = PID >> 16;
uint XOR = TID ^ LID ^ SID ^ HID;
// Ensure we don't have a shiny.
if (XOR >> 3 == 1) // Illegal, fix. (not 16<XOR>=8)
{
// Keep as shiny, so we have to mod the PID
PID ^= XOR;
TB_PID.Text = PID.ToString("X8");
TB_EC.Text = PID.ToString("X8");
}
else if ((XOR ^ 0x8000) >> 3 == 1 && PID != EC)
TB_EC.Text = (PID ^ 0x80000000).ToString("X8");
else // Not Illegal, no fix.
TB_EC.Text = PID.ToString("X8");
}
pk7.EncryptionConstant = Util.GetHexValue(TB_EC.Text); pk7.EncryptionConstant = Util.GetHexValue(TB_EC.Text);
pk7.Checksum = 0; // 0 CHK for now pk7.Checksum = 0; // 0 CHK for now
@ -190,7 +168,6 @@ namespace PKHeX.WinForms.Controls
pk7.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number pk7.AbilityNumber = Util.ToInt32(TB_AbilityNumber.Text); // Number
} }
// pkx[0x16], pkx[0x17] are handled by the Medals UI (Hits & Training Bag)
pk7.PID = Util.GetHexValue(TB_PID.Text); pk7.PID = Util.GetHexValue(TB_PID.Text);
pk7.Nature = (byte)WinFormsUtil.GetIndex(CB_Nature); pk7.Nature = (byte)WinFormsUtil.GetIndex(CB_Nature);
pk7.FatefulEncounter = CHK_Fateful.Checked; pk7.FatefulEncounter = CHK_Fateful.Checked;

26
PKHeX.WinForms/Controls/PKM Editor/PKMEditor.cs
View file

@ -807,6 +807,32 @@ namespace PKHeX.WinForms.Controls
return true; return true;
} }
private void CheckTransferPIDValid()
{
if (pkm.Version >= 24)
return;
uint EC = Util.GetHexValue(TB_EC.Text);
uint PID = Util.GetHexValue(TB_PID.Text);
uint SID = Util.ToUInt32(TB_SID.Text);
uint TID = Util.ToUInt32(TB_TID.Text);
uint LID = PID & 0xFFFF;
uint HID = PID >> 16;
uint XOR = TID ^ LID ^ SID ^ HID;
// Ensure we don't have a shiny.
if (XOR >> 3 == 1) // Illegal, fix. (not 16<XOR>=8)
{
// Keep as shiny, so we have to mod the PID
PID ^= XOR;
TB_PID.Text = PID.ToString("X8");
TB_EC.Text = PID.ToString("X8");
}
else if ((XOR ^ 0x8000) >> 3 == 1 && PID != EC)
TB_EC.Text = (PID ^ 0x80000000).ToString("X8");
else // Not Illegal, no fix.
TB_EC.Text = PID.ToString("X8");
}
private void UpdateIVs(object sender, EventArgs e) private void UpdateIVs(object sender, EventArgs e)
{ {