Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2024-11-27 06:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove GSC/C differentiation in PK2

Browse source 
Allows for no adjusting the game group
This commit is contained in:
Kurt 2019-07-28 13:26:35 -07:00
parent 79127d02e4
commit 7424cf6fb0
3 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
PKHeX.Core/Game/GameUtil.cs
View file

@ -40,12 +40,13 @@ namespace PKHeX.Core
case GO: case GO:
return GO; return GO;
// Gen1 // VC Transfers
case RBY: case RD: case BU: case YW: case GN: case RD: case BU: case YW: case GN:
return RBY; case GD: case SV: case C:
return USUM;
// Gen2 // Gen2 -- PK2
case GS: case GD: case SV: case C: case GS: case GSC:
return GSC; return GSC;
// Gen3 // Gen3

4
PKHeX.Core/PKM/PK2.cs
View file

@ -88,7 +88,7 @@ namespace PKHeX.Core
public override bool IsEgg { get; set; } public override bool IsEgg { get; set; }
public override bool HasOriginalMetLocation => CaughtData != 0; public override bool HasOriginalMetLocation => CaughtData != 0;
public override int Version { get => HasOriginalMetLocation ? (int)GameVersion.C : (int)GameVersion.GSC; set { } } public override int Version { get => (int)GameVersion.GSC; set { } }
// Maximums // Maximums
public override int MaxMoveID => Legal.MaxMoveID_2; public override int MaxMoveID => Legal.MaxMoveID_2;
@ -136,7 +136,7 @@ namespace PKHeX.Core
PID = Util.Rand32(), PID = Util.Rand32(),
Ball = 4, Ball = 4,
MetDate = DateTime.Now, MetDate = DateTime.Now,
Version = CaughtData != 0 ? (int)GameVersion.C : (int)GameVersion.SV, Version = HasOriginalMetLocation ? (int)GameVersion.C : (int)GameVersion.SV,
Move1 = Move1, Move1 = Move1,
Move2 = Move2, Move2 = Move2,
Move3 = Move3, Move3 = Move3,

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

@ -547,13 +547,14 @@ namespace PKHeX.WinForms.Controls
private void ClickTRGender(object sender, EventArgs e) private void ClickTRGender(object sender, EventArgs e)
{ {
Label lbl = sender as Label; if (!(sender is Label lbl))
if (!string.IsNullOrWhiteSpace(lbl?.Text)) // set gender label (toggle M/F) return;
{ if (string.IsNullOrWhiteSpace(lbl.Text))
int gender = PKX.GetGenderFromString(lbl.Text) ^ 1; return;
lbl.Text = gendersymbols[gender];
lbl.ForeColor = Draw.GetGenderColor(gender); int gender = PKX.GetGenderFromString(lbl.Text) ^ 1;
} lbl.Text = gendersymbols[gender];
lbl.ForeColor = Draw.GetGenderColor(gender);
} }
private void ClickBall(object sender, EventArgs e) private void ClickBall(object sender, EventArgs e)
@ -1067,10 +1068,6 @@ namespace PKHeX.WinForms.Controls
// check if differs // check if differs
var group = GameUtil.GetMetLocationVersionGroup(Version); var group = GameUtil.GetMetLocationVersionGroup(Version);
if (group == GameVersion.GSC && pkm.Format >= 7)
group = GameVersion.USUM;
else if (pkm.Format < 3)
group = GameVersion.GSC;
if (group != origintrack) if (group != origintrack)
ReloadMetLocations(Version); ReloadMetLocations(Version);