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

Add display TID/SID get/set

Browse Source
This commit is contained in:
Kurt
2019-02-10 10:31:20 -08:00
parent 9715a08342
commit 182348526c
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
PKHeX.Core/PKM/PKM.cs
View File

@@ -279,6 +279,18 @@ private byte[] Write()
public int TrainerID7 { get => (int)((uint)(TID | (SID << 16)) % 1000000); set => SetID7(TrainerSID7, value); }
public int TrainerSID7 { get => (int)((uint)(TID | (SID << 16)) / 1000000); set => SetID7(value, TrainerID7); }
public int DisplayTID
{
get => GenNumber >= 7 ? TrainerID7 : TID;
set => _ = GenNumber >= 7 ? (TrainerID7 = value) : (TID = value);
}
public int DisplaySID
{
get => GenNumber >= 7 ? TrainerSID7 : SID;
set => _ = GenNumber >= 7 ? (TrainerSID7 = value) : (SID = value);
}
private void SetID7(int sid7, int tid7)
{
var oid = (sid7 * 1_000_000) + (tid7 % 1_000_000);

4
PKHeX.WinForms/Subforms/Misc/PKMPreview.cs
View File

@@ -79,8 +79,8 @@ public class PKMPreview
public bool IsNicknamed => pkm.IsNicknamed;
public bool IsShiny => pkm.IsShiny;
public int TID => pkm.GenNumber >= 7 ? pkm.TrainerID7 : pkm.TID;
public int SID => pkm.GenNumber >= 7 ? pkm.TrainerSID7 : pkm.SID;
public int TID => pkm.DisplayTID;
public int SID => pkm.DisplaySID;
public int TSV => pkm.TSV;
public int Move1_PP => pkm.Move1_PP;
public int Move2_PP => pkm.Move2_PP;