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

Simplify get/decrypt pkm access

Browse source
This commit is contained in:
Kurt 2019-03-29 19:43:33 -07:00
parent 5dcf2f4dc8
commit bb8cf5d3d8
19 changed files with 40 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PKHeX.Core/Editing/Saves/Slots/SlotChange.cs
View file

@ -5,9 +5,6 @@
/// <summary> Parent of the object that initiated the slot change. </summary> /// <summary> Parent of the object that initiated the slot change. </summary>
public object Parent { get; set; } public object Parent { get; set; }
/// <summary> Original Data of the slot. </summary>
public byte[] OriginalData { get; set; }
public int Slot { get; set; } = -1; public int Slot { get; set; } = -1;
public int Box { get; set; } = -1; public int Box { get; set; } = -1;
public PKM PKM { get; set; } public PKM PKM { get; set; }

6
PKHeX.Core/Editing/Saves/Slots/SlotChangeInfo.cs
View file

@ -12,11 +12,11 @@
public SlotChange Source { get; set; } public SlotChange Source { get; set; }
public SlotChange Destination { get; set; } public SlotChange Destination { get; set; }
private readonly byte[] BlankData; private readonly PKM Blank;
public SlotChangeInfo(SaveFile sav) public SlotChangeInfo(SaveFile sav)
{ {
BlankData = sav.BlankPKM.EncryptedPartyData; Blank = sav.BlankPKM;
Reset(); Reset();
} }
@ -25,7 +25,7 @@
public void Reset() public void Reset()
{ {
LeftMouseIsDown = RightMouseIsDown = DragDropInProgress = false; LeftMouseIsDown = RightMouseIsDown = DragDropInProgress = false;
Source = new SlotChange { OriginalData = BlankData }; Source = new SlotChange { PKM = Blank };
Destination = new SlotChange(); Destination = new SlotChange();
Cursor = CurrentPath = null; Cursor = CurrentPath = null;
} }

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

@ -453,14 +453,14 @@ namespace PKHeX.Core
// Don't allow for custom box names // Don't allow for custom box names
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
if (data.Length == SIZE_STORED) if (data.Length == SIZE_STORED)
return new PokeList1(data, PokeListType.Single, Japanese)[0]; return new PokeList1(data, PokeListType.Single, Japanese)[0];
return new PK1(data); return new PK1(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return data; return data;
} }

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

@ -487,14 +487,14 @@ namespace PKHeX.Core
SetData(data, Offsets.BoxNames + (box * len)); SetData(data, Offsets.BoxNames + (box * len));
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
if (data.Length == SIZE_STORED) if (data.Length == SIZE_STORED)
return new PokeList2(data, PokeListType.Single, Japanese)[0]; return new PokeList2(data, PokeListType.Single, Japanese)[0];
return new PK2(data); return new PK2(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return data; return data;
} }

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

@ -708,12 +708,12 @@ namespace PKHeX.Core
SetString(value, 8).CopyTo(Data, offset + (box * 9)); SetString(value, 8).CopyTo(Data, offset + (box * 9));
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
return new PK3(data); return new PK3(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return PKX.DecryptArray3(data); return PKX.DecryptArray3(data);
} }

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

@ -302,14 +302,14 @@ namespace PKHeX.Core
SetString(value, 8).CopyTo(Data, Box + (0x24A4 * box)); SetString(value, 8).CopyTo(Data, Box + (0x24A4 * box));
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
if (data.Length != SIZE_STORED) if (data.Length != SIZE_STORED)
Array.Resize(ref data, SIZE_STORED); Array.Resize(ref data, SIZE_STORED);
return new CK3(data); return new CK3(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return data; return data;
} }

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

@ -165,14 +165,14 @@ namespace PKHeX.Core
SetData(data, offset); SetData(data, offset);
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
if (data.Length != PKX.SIZE_3STORED) if (data.Length != PKX.SIZE_3STORED)
Array.Resize(ref data, PKX.SIZE_3STORED); Array.Resize(ref data, PKX.SIZE_3STORED);
return new PK3(data); return new PK3(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
if (data.Length != PKX.SIZE_3STORED) if (data.Length != PKX.SIZE_3STORED)
Array.Resize(ref data, PKX.SIZE_3STORED); Array.Resize(ref data, PKX.SIZE_3STORED);

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

@ -264,20 +264,20 @@ namespace PKHeX.Core
SetString(value, 8).CopyTo(Data, GetBoxInfoOffset(box)); SetString(value, 8).CopyTo(Data, GetBoxInfoOffset(box));
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
if (data.Length != SIZE_STORED) if (data.Length != SIZE_STORED)
Array.Resize(ref data, SIZE_STORED); Array.Resize(ref data, SIZE_STORED);
return new XK3(data); return new XK3(data);
} }
public override byte[] DecryptPKM(byte[] data) => data; protected override byte[] DecryptPKM(byte[] data) => data;
public override PKM GetPartySlot(int offset) => GetStoredSlot(offset); public override PKM GetPartySlot(int offset) => GetStoredSlot(offset);
public override PKM GetStoredSlot(int offset) public override PKM GetStoredSlot(int offset)
{ {
// Get Shadow Data // Get Shadow Data
var pk = (XK3)GetPKM(DecryptPKM(GetData(offset, SIZE_STORED))); var pk = (XK3)base.GetStoredSlot(offset);
if (pk.ShadowID > 0 && pk.ShadowID < ShadowInfo.Count) if (pk.ShadowID > 0 && pk.ShadowID < ShadowInfo.Count)
pk.Purification = ShadowInfo[pk.ShadowID - 1].Purification; pk.Purification = ShadowInfo[pk.ShadowID - 1].Purification;
return pk; return pk;

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

@ -627,12 +627,12 @@ namespace PKHeX.Core
SetData(SetString(value, 13), offset + (box * 0x28)); SetData(SetString(value, 13), offset + (box * 0x28));
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
return new PK4(data); return new PK4(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return PKX.DecryptArray45(data); return PKX.DecryptArray45(data);
} }

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

@ -205,14 +205,14 @@ namespace PKHeX.Core
SetData(data, ofs); SetData(data, ofs);
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
if (data.Length != SIZE_STORED) if (data.Length != SIZE_STORED)
Array.Resize(ref data, SIZE_STORED); Array.Resize(ref data, SIZE_STORED);
return new BK4(data); return new BK4(data);
} }
public override byte[] DecryptPKM(byte[] data) => data; protected override byte[] DecryptPKM(byte[] data) => data;
protected override void SetDex(PKM pkm) { /* There's no PokéDex */ } protected override void SetDex(PKM pkm) { /* There's no PokéDex */ }

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

@ -262,12 +262,12 @@ namespace PKHeX.Core
set { } set { }
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
return new PK5(data); return new PK5(data);
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return PKX.DecryptArray45(data); return PKX.DecryptArray45(data);
} }

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

@ -778,7 +778,7 @@ namespace PKHeX.Core
SetData(Encoding.Unicode.GetBytes(value.PadRight(LongStringLength / 2, '\0')), PCLayout + (LongStringLength * box)); SetData(Encoding.Unicode.GetBytes(value.PadRight(LongStringLength / 2, '\0')), PCLayout + (LongStringLength * box));
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
return new PK6(data); return new PK6(data);
} }
@ -939,7 +939,7 @@ namespace PKHeX.Core
return false; return false;
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return PKX.DecryptArray(data); return PKX.DecryptArray(data);
} }

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

@ -967,7 +967,7 @@ namespace PKHeX.Core
Edited = true; Edited = true;
} }
public override PKM GetPKM(byte[] data) protected override PKM GetPKM(byte[] data)
{ {
return new PK7(data); return new PK7(data);
} }
@ -1233,7 +1233,7 @@ namespace PKHeX.Core
return false; return false;
} }
public override byte[] DecryptPKM(byte[] data) protected override byte[] DecryptPKM(byte[] data)
{ {
return PKX.DecryptArray(data); return PKX.DecryptArray(data);
} }

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

@ -170,8 +170,8 @@ namespace PKHeX.Core
public override bool GetCaught(int species) => Zukan.GetCaught(species); public override bool GetCaught(int species) => Zukan.GetCaught(species);
public override bool GetSeen(int species) => Zukan.GetSeen(species); public override bool GetSeen(int species) => Zukan.GetSeen(species);
public override PKM GetPKM(byte[] data) => new PB7(data); protected override PKM GetPKM(byte[] data) => new PB7(data);
public override byte[] DecryptPKM(byte[] data) => PKX.DecryptArray(data); protected override byte[] DecryptPKM(byte[] data) => PKX.DecryptArray(data);
public override int GetBoxOffset(int box) => Box + (box * BoxSlotCount * SIZE_STORED); public override int GetBoxOffset(int box) => Box + (box * BoxSlotCount * SIZE_STORED);
protected override IList<int>[] SlotPointers => new[] { Storage.PokeListInfo }; protected override IList<int>[] SlotPointers => new[] { Storage.PokeListInfo };

10
PKHeX.Core/Saves/SaveFile.cs
View file

@ -38,9 +38,9 @@ namespace PKHeX.Core
// General PKM Properties // General PKM Properties
public abstract Type PKMType { get; } public abstract Type PKMType { get; }
public abstract PKM GetPKM(byte[] data); protected abstract PKM GetPKM(byte[] data);
protected abstract byte[] DecryptPKM(byte[] data);
public abstract PKM BlankPKM { get; } public abstract PKM BlankPKM { get; }
public abstract byte[] DecryptPKM(byte[] data);
public abstract int SIZE_STORED { get; } public abstract int SIZE_STORED { get; }
protected abstract int SIZE_PARTY { get; } protected abstract int SIZE_PARTY { get; }
public abstract int MaxEV { get; } public abstract int MaxEV { get; }
@ -596,11 +596,7 @@ namespace PKHeX.Core
=> SetPartySlot(pkm, GetPartyOffset(index), trade, dex); => SetPartySlot(pkm, GetPartyOffset(index), trade, dex);
public virtual PKM GetPartySlot(int offset) => GetPKM(DecryptPKM(GetData(offset, SIZE_PARTY))); public virtual PKM GetPartySlot(int offset) => GetPKM(DecryptPKM(GetData(offset, SIZE_PARTY)));
public virtual PKM GetStoredSlot(int offset) => GetPKM(DecryptPKM(GetData(offset, SIZE_STORED)));
public virtual PKM GetStoredSlot(int offset)
{
return GetPKM(DecryptPKM(GetData(offset, SIZE_STORED)));
}
public void SetPartySlot(PKM pkm, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault) public void SetPartySlot(PKM pkm, int offset, PKMImportSetting trade = PKMImportSetting.UseDefault, PKMImportSetting dex = PKMImportSetting.UseDefault)
{ {

4
PKHeX.Core/Saves/Storage/BulkStorage.cs
View file

@ -36,8 +36,8 @@ namespace PKHeX.Core
public override Type PKMType => blank.GetType(); public override Type PKMType => blank.GetType();
public override PKM BlankPKM => blank.Clone(); public override PKM BlankPKM => blank.Clone();
public override PKM GetPKM(byte[] data) => PKMConverter.GetPKMfromBytes(data, prefer: Generation); protected override PKM GetPKM(byte[] data) => PKMConverter.GetPKMfromBytes(data, prefer: Generation);
public override byte[] DecryptPKM(byte[] data) => GetPKM(data).Data; protected override byte[] DecryptPKM(byte[] data) => GetPKM(data).Data;
public override int SIZE_STORED => blank.SIZE_STORED; public override int SIZE_STORED => blank.SIZE_STORED;
protected override int SIZE_PARTY => blank.SIZE_PARTY; protected override int SIZE_PARTY => blank.SIZE_PARTY;

4
PKHeX.Core/Saves/Storage/SAV4Ranch.cs
View file

@ -20,8 +20,8 @@ namespace PKHeX.Core
public override string Extension => ".bin"; public override string Extension => ".bin";
public override string Filter { get; } = "Ranch G4 Storage|*.bin*"; public override string Filter { get; } = "Ranch G4 Storage|*.bin*";
public override PKM GetPKM(byte[] data) => new PK4(data); protected override PKM GetPKM(byte[] data) => new PK4(data);
public override byte[] DecryptPKM(byte[] data) => PKX.DecryptArray45(data); protected override byte[] DecryptPKM(byte[] data) => PKX.DecryptArray45(data);
public override StorageSlotFlag GetSlotFlags(int index) => index >= SlotCount ? StorageSlotFlag.Locked : StorageSlotFlag.None; public override StorageSlotFlag GetSlotFlags(int index) => index >= SlotCount ? StorageSlotFlag.Locked : StorageSlotFlag.None;
protected override bool IsSlotSwapProtected(int box, int slot) => IsSlotOverwriteProtected(box, slot); protected override bool IsSlotSwapProtected(int box, int slot) => IsSlotOverwriteProtected(box, slot);

7
PKHeX.WinForms/Controls/SAV Editor/SlotChangeManager.cs
View file

@ -247,7 +247,7 @@ namespace PKHeX.WinForms.Controls
// Prepare Data // Prepare Data
DragInfo.Source = GetViewParent(pb).GetSlotData(pb); DragInfo.Source = GetViewParent(pb).GetSlotData(pb);
DragInfo.Source.OriginalData = SAV.GetData(DragInfo.Source.Offset, SAV.SIZE_STORED); DragInfo.Source.PKM = SAV.GetStoredSlot(DragInfo.Source.Offset);
// Make a new file name based off the PID // Make a new file name based off the PID
string newfile = CreateDragDropPKM(pb, encrypt, out bool external); string newfile = CreateDragDropPKM(pb, encrypt, out bool external);
@ -272,11 +272,8 @@ namespace PKHeX.WinForms.Controls
private string CreateDragDropPKM(PictureBox pb, bool encrypt, out bool external) private string CreateDragDropPKM(PictureBox pb, bool encrypt, out bool external)
{ {
byte[] dragdata = SAV.DecryptPKM(DragInfo.Source.OriginalData);
Array.Resize(ref dragdata, SAV.SIZE_STORED);
// Make File // Make File
PKM pk = SAV.GetPKM(dragdata); PKM pk = DragInfo.Source.PKM;
string newfile = FileUtil.GetPKMTempFileName(pk, encrypt); string newfile = FileUtil.GetPKMTempFileName(pk, encrypt);
try try
{ {

6
PKHeX.WinForms/Subforms/Save Editors/Gen7/SAV_FestivalPlaza.cs
View file

@ -278,9 +278,9 @@ namespace PKHeX.WinForms
private void LoadBattleAgency() private void LoadBattleAgency()
{ {
p[0] = SAV.GetPKM(SAV.DecryptPKM(SAV.GetData(0x6C200, 0xE8))); p[0] = SAV.GetStoredSlot(0x6C200);
p[1] = SAV.GetPKM(SAV.DecryptPKM(SAV.GetData(0x6C2E8, 0x104))); p[1] = SAV.GetPartySlot(0x6C2E8);
p[2] = SAV.GetPKM(SAV.DecryptPKM(SAV.GetData(0x6C420, 0x104))); p[2] = SAV.GetPartySlot(0x6C420);
LoadPictureBox(); LoadPictureBox();
B_ImportParty.Visible = SAV.HasParty; B_ImportParty.Visible = SAV.HasParty;
CHK_Choosed.Checked = SAV.GetFlag(0x6C55E, 1); CHK_Choosed.Checked = SAV.GetFlag(0x6C55E, 1);