Mirrors/PKHeX
2
0
Fork 0
mirror of https://github.com/kwsch/PKHeX synced 2025-02-17 05:48:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor tweaks, no functional change

Browse source
This commit is contained in:
Kurt 2019-07-21 12:30:21 -07:00
parent 9cab2e366d
commit 9ed47cc8fd
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PKHeX.Core/Saves/SAV1.cs
View file

@ -20,13 +20,13 @@ namespace PKHeX.Core
return 1 <= gen && gen <= 2;
}).ToArray();
public SAV1(GameVersion versionOverride = GameVersion.RBY, bool japanese = false) : base(SaveUtil.SIZE_G1RAW)
public SAV1(GameVersion version = GameVersion.RBY, bool japanese = false) : base(SaveUtil.SIZE_G1RAW)
{
Version = versionOverride;
Version = version;
Japanese = japanese;
Offsets = Japanese ? SAV1Offsets.JPN : SAV1Offsets.INT;
Initialize(versionOverride);
Initialize(version);
ClearBoxes();
}

4
PKHeX.Core/Saves/SAV2.cs
View file

@ -22,9 +22,9 @@ namespace PKHeX.Core
return 1 <= gen && gen <= 2;
}).ToArray();
public SAV2(GameVersion versionOverride = GameVersion.C, LanguageID lang = LanguageID.English) : base(SaveUtil.SIZE_G2RAW_J)
public SAV2(GameVersion version = GameVersion.C, LanguageID lang = LanguageID.English) : base(SaveUtil.SIZE_G2RAW_J)
{
Version = versionOverride;
Version = version;
switch (lang)
{
case LanguageID.Japanese:

24
PKHeX.Core/Saves/SAV4.cs
View file

@ -13,9 +13,9 @@ namespace PKHeX.Core
public override string Filter => (Footer.Length > 0 ? "DeSmuME DSV|*.dsv|" : string.Empty) + "SAV File|*.sav|All Files|*.*";
public override string Extension => ".sav";
public SAV4(GameVersion versionOverride = GameVersion.HGSS) : base(SaveUtil.SIZE_G4RAW)
public SAV4(GameVersion version = GameVersion.HGSS) : base(SaveUtil.SIZE_G4RAW)
{
Version = versionOverride;
Version = version;
Initialize();
ClearBoxes();
}
@ -61,8 +61,8 @@ namespace PKHeX.Core
public override int BoxCount => 18;
public override int MaxEV => 255;
public override int Generation => 4;
protected override int EventFlagMax => EventFlag > 0 ? 0xB60 : int.MinValue;
protected override int EventConstMax => EventConst > 0 ? (EventFlag - EventConst) >> 1 : int.MinValue;
protected override int EventFlagMax => 0xB60; // 2912
protected override int EventConstMax => (EventFlag - EventConst) >> 1;
protected override int GiftCountMax => 11;
public override int OTLength => 7;
public override int NickLength => 10;
@ -375,8 +375,8 @@ namespace PKHeX.Core
public override int TID
{
get => BitConverter.ToUInt16(Data, Trainer1 + 0x10 + 0);
set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Trainer1 + 0x10 + 0);
get => BitConverter.ToUInt16(Data, Trainer1 + 0x10);
set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Trainer1 + 0x10);
}
public override int SID
@ -391,12 +391,6 @@ namespace PKHeX.Core
set => BitConverter.GetBytes(value).CopyTo(Data, Trainer1 + 0x14);
}
public uint Coin
{
get => BitConverter.ToUInt16(Data, Trainer1 + 0x20);
set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Trainer1 + 0x20);
}
public override int Gender
{
get => Data[Trainer1 + 0x18];
@ -439,6 +433,12 @@ namespace PKHeX.Core
}
}
public uint Coin
{
get => BitConverter.ToUInt16(Data, Trainer1 + 0x20);
set => BitConverter.GetBytes((ushort)value).CopyTo(Data, Trainer1 + 0x20);
}
public override int PlayedHours
{
get => BitConverter.ToUInt16(Data, Trainer1 + 0x22);

12
PKHeX.Core/Saves/Util/SaveUtil.cs
View file

@ -570,12 +570,12 @@ namespace PKHeX.Core
{
case GameVersion.RD: case GameVersion.BU: case GameVersion.GN: case GameVersion.YW:
case GameVersion.RBY:
return new SAV1(versionOverride: Game);
return new SAV1(version: Game);
case GameVersion.GS: case GameVersion.GD: case GameVersion.SV:
return new SAV2(versionOverride: GameVersion.GS);
return new SAV2(version: GameVersion.GS);
case GameVersion.GSC: case GameVersion.C:
return new SAV2(versionOverride: GameVersion.C);
return new SAV2(version: GameVersion.C);
case GameVersion.R: case GameVersion.S: case GameVersion.E: case GameVersion.FR: case GameVersion.LG:
return new SAV3(version: Game);
@ -596,11 +596,11 @@ namespace PKHeX.Core
case GameVersion.D: case GameVersion.P: case GameVersion.DP:
case GameVersion.DPPt:
return new SAV4(GameVersion.DP);
return new SAV4(version: GameVersion.DP);
case GameVersion.Pt:
return new SAV4(GameVersion.Pt);
return new SAV4(version: GameVersion.Pt);
case GameVersion.HG: case GameVersion.SS: case GameVersion.HGSS:
return new SAV4(GameVersion.HGSS);
return new SAV4(version: GameVersion.HGSS);
case GameVersion.B: case GameVersion.W: case GameVersion.BW:
return new SAV5BW();