mirror of
https://github.com/kwsch/PKHeX
synced 2024-11-15 00:37:11 +00:00
Fix loading past gen formats
Mainly from database viewer, also skip annoying MessageBox if loaded from Database.
This commit is contained in:
parent
419ed553cb
commit
2443ace5f8
1 changed files with 2 additions and 2 deletions
|
@ -1062,7 +1062,7 @@ namespace PKHeX
|
|||
{
|
||||
if (pk == null) { Util.Error("Attempted to load a null file."); return; }
|
||||
|
||||
if (pk.Format != SAV.Generation)
|
||||
if (pk.Format > SAV.Generation)
|
||||
{ Util.Alert("Can't load future generation files."); return; }
|
||||
|
||||
bool oldInit = fieldsInitialized;
|
||||
|
@ -1079,7 +1079,7 @@ namespace PKHeX
|
|||
{
|
||||
string c;
|
||||
pkm = PKMConverter.convertToFormat(pkm, SAV.Generation, out c);
|
||||
if (pk.Format != pkm.Format) // converted
|
||||
if (pk.Format != pkm.Format && focus) // converted
|
||||
Util.Alert("Converted File.");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue