Minor Tweaks (ORASDEMO)

Simplifies checking for ORAS so that ORAS includes ORASDEMO by default.

Hide tab pages properly.
This commit is contained in:
Kaphotics 2016-01-23 08:42:11 -08:00
parent 808e4b6a9f
commit cfc93ef96e
3 changed files with 12 additions and 5 deletions

View file

@ -49,7 +49,7 @@ namespace PKHeX
{
/* 00: */ Item = 0x00000; Items = new Inventory(Item, 1);
/* 01: */ // = 0x00C00; // Select Bound Items
/* 02: */ // = 0x00E00; [00038] // ???
/* 02: */ AdventureInfo = 0x00E00;
/* 03: */ Trainer1 = 0x01000;
/* 04: */ // = 0x01200; [00004] // ???
/* 05: */ PlayTime = 0x01400;
@ -208,7 +208,7 @@ namespace PKHeX
}
}
public bool ORASDEMO => Data.Length == SIZE_ORASDEMO;
public bool ORAS => !ORASDEMO && (Version == GameVersion.OR || Version == GameVersion.AS);
public bool ORAS => Version == GameVersion.OR || Version == GameVersion.AS;
public bool XY => Version == GameVersion.X || Version == GameVersion.Y;
// Save Information

View file

@ -2681,7 +2681,7 @@ namespace PKHeX
int offset = getPKXOffset(slot);
byte[] pkxdata = preparepkx();
if (!(SAV.ORAS || SAV.ORASDEMO))
if (!(SAV.ORAS))
{
PK6 pk = new PK6(pkxdata);
// User Protection

View file

@ -26,8 +26,15 @@ namespace PKHeX
TB_MCMN,TB_MCMS,TB_MBMN,TB_MBMS,
};
L_MultiplayerSprite.Enabled = CB_MultiplayerSprite.Enabled = Main.SAV.ORAS || Main.SAV.ORASDEMO;
L_Style.Visible = TB_Style.Visible = Tab_Appearance.Visible = SAV.XY;
L_MultiplayerSprite.Enabled = CB_MultiplayerSprite.Enabled = Main.SAV.ORAS;
L_Style.Visible = TB_Style.Visible = SAV.XY;
if (!SAV.XY)
TC_Editor.TabPages.Remove(Tab_Appearance);
if (SAV.ORASDEMO)
{
TC_Editor.TabPages.Remove(Tab_Maison);
TC_Editor.TabPages.Remove(Tab_Multiplayer);
}
editing = true;
GB_Map.Enabled = Main.ramsav == null;