zontreck/ACSE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Give New Leaf CRC32 types accurate names & SetNewImage extension method

Browse source
This commit is contained in:
Cuyler36 2018-11-07 13:28:10 -05:00
parent 9275e82418
commit 1a868d4959
5 changed files with 45 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
ACSE.Core/Saves/Checksums/NewLeafCRC32Type2.cs → ACSE.Core/Saves/Checksums/NewLeafCRC32Normal.cs
View file

2
ACSE.Core/Saves/Checksums/NewLeafCRC32Type1.cs → ACSE.Core/Saves/Checksums/NewLeafCRC32Reflected.cs
View file

@ -3,7 +3,7 @@
namespace ACSE.Core.Saves.Checksums
{
public sealed class NewLeafCRC32Type1 : IChecksum<uint>
public sealed class NewLeafCRC32Reflected : IChecksum<uint>
{
public static uint[] NewLeafCrcTableType1 = {
0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F,

50
ACSE.Core/Saves/Save.cs
View file

@ -194,83 +194,83 @@ public void Flush()
crc32.Calculate(SaveData.Skip(SaveDataStartOffset + 0x24).Take(0x111C).ToArray()), true);
break;
case SaveType.NewLeaf:
var crc32Type1 = new NewLeafCRC32Type1();
var crc32Reflected = new NewLeafCRC32Reflected();
Write(SaveDataStartOffset,
crc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 4).Take(0x1C).ToArray()));
crc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 4).Take(0x1C).ToArray()));
for (var i = 0; i < 4; i++)
{
var dataOffset = SaveDataStartOffset + 0x20 + i * 0x9F10;
Write(dataOffset,
crc32Type1.Calculate(SaveData.Skip(dataOffset + 4).Take(0x6B64).ToArray()));
crc32Reflected.Calculate(SaveData.Skip(dataOffset + 4).Take(0x6B64).ToArray()));
var dataOffset2 = SaveDataStartOffset + 0x20 + 0x6B68 + i * 0x9F10;
Write(dataOffset2,
crc32Type1.Calculate(SaveData.Skip(dataOffset2 + 4).Take(0x33A4).ToArray()));
crc32Reflected.Calculate(SaveData.Skip(dataOffset2 + 4).Take(0x33A4).ToArray()));
}
Write(SaveDataStartOffset + 0x27C60,
crc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x27C60 + 4).Take(0x218B0)
crc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x27C60 + 4).Take(0x218B0)
.ToArray()));
Write(SaveDataStartOffset + 0x49520,
crc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x49520 + 4).Take(0x44B8)
crc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x49520 + 4).Take(0x44B8)
.ToArray()));
Write(SaveDataStartOffset + 0x4D9DC,
crc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x4D9DC + 4).Take(0x1E420)
crc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x4D9DC + 4).Take(0x1E420)
.ToArray()));
Write(SaveDataStartOffset + 0x6BE00,
crc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x6BE00 + 4).Take(0x20)
crc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x6BE00 + 4).Take(0x20)
.ToArray()));
Write(SaveDataStartOffset + 0x6BE24,
crc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x6BE24 + 4).Take(0x13AF8)
crc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x6BE24 + 4).Take(0x13AF8)
.ToArray()));
break;
case SaveType.WelcomeAmiibo:
var waCrc32Type1 = new NewLeafCRC32Type1();
var waCrc32Type2 = new NewLeafCRC32Type2();
var wCrc32Reflected = new NewLeafCRC32Reflected();
var wCrc32Normal = new NewLeafCRC32Normal();
// CRC32 Implementation Type 1 Checksums
// Reflected CRC32 Implementation Checksums
Write(SaveDataStartOffset,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 4).Take(0x1C).ToArray()));
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 4).Take(0x1C).ToArray()));
for (var i = 0; i < 4; i++)
{
var dataOffset = SaveDataStartOffset + 0x20 + i * 0xA480;
Write(dataOffset,
waCrc32Type1.Calculate(SaveData.Skip(dataOffset + 4).Take(0x6B84).ToArray()));
wCrc32Reflected.Calculate(SaveData.Skip(dataOffset + 4).Take(0x6B84).ToArray()));
var dataOffset2 = SaveDataStartOffset + 0x20 + 0x6B88 + i * 0xA480;
Write(dataOffset2,
waCrc32Type1.Calculate(SaveData.Skip(dataOffset2 + 4).Take(0x38F4).ToArray()));
wCrc32Reflected.Calculate(SaveData.Skip(dataOffset2 + 4).Take(0x38F4).ToArray()));
}
Write(SaveDataStartOffset + 0x29220,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x29220 + 4).Take(0x22BC8)
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x29220 + 4).Take(0x22BC8)
.ToArray()));
Write(SaveDataStartOffset + 0x4BE00,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x4BE00 + 4).Take(0x44B8)
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x4BE00 + 4).Take(0x44B8)
.ToArray()));
Write(SaveDataStartOffset + 0x533A4,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x533A4 + 4).Take(0x1E4D8)
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x533A4 + 4).Take(0x1E4D8)
.ToArray()));
Write(SaveDataStartOffset + 0x71880,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x71880 + 4).Take(0x20)
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x71880 + 4).Take(0x20)
.ToArray()));
Write(SaveDataStartOffset + 0x718A4,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x718A4 + 4).Take(0xBE4)
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x718A4 + 4).Take(0xBE4)
.ToArray()));
Write(SaveDataStartOffset + 0x738D4,
waCrc32Type1.Calculate(SaveData.Skip(SaveDataStartOffset + 0x738D4 + 4).Take(0x16188)
wCrc32Reflected.Calculate(SaveData.Skip(SaveDataStartOffset + 0x738D4 + 4).Take(0x16188)
.ToArray()));
// CRC32 Implementation Type 2 Checksums
// Normal CRC32 Implementation Checksums
Write(SaveDataStartOffset + 0x502BC,
waCrc32Type2.Calculate(SaveData.Skip(SaveDataStartOffset + 0x502BC + 4).Take(0x28F0)
wCrc32Normal.Calculate(SaveData.Skip(SaveDataStartOffset + 0x502BC + 4).Take(0x28F0)
.ToArray()));
Write(SaveDataStartOffset + 0x52BB0,
waCrc32Type2.Calculate(SaveData.Skip(SaveDataStartOffset + 0x52BB0 + 4).Take(0x7F0)
wCrc32Normal.Calculate(SaveData.Skip(SaveDataStartOffset + 0x52BB0 + 4).Take(0x7F0)
.ToArray()));
Write(SaveDataStartOffset + 0x7248C,
waCrc32Type2.Calculate(SaveData.Skip(SaveDataStartOffset + 0x7248C + 4).Take(0x1444)
wCrc32Normal.Calculate(SaveData.Skip(SaveDataStartOffset + 0x7248C + 4).Take(0x1444)
.ToArray()));
break;
}

18
ACSE.WinForms/Extensions/ControlExtensions.cs
View file

@ -1,14 +1,18 @@
namespace System.Windows.Forms
using System.Drawing;
namespace System.Windows.Forms
{
public static class ControlExtension
{
public static void DisposeChildren(this Control.ControlCollection collection)
{
if (collection.IsReadOnly) return;
for (var i = collection.Count - 1; i >= 0; i--)
{
collection[i].Dispose();
}
collection.Clear();
}
@ -25,5 +29,17 @@ public static void SetCenterMargins(this Control control, int leftPadding = 0, i
SetCenterMargins(control, control.Parent, leftPadding, rightPadding);
}
}
public static void SetNewImage(this PictureBox pictureBox, Image newImage)
{
pictureBox.Image?.Dispose();
pictureBox.Image = newImage;
}
public static void SetNewBackgroundImage(this PictureBox pictureBox, Image newImage)
{
pictureBox.BackgroundImage?.Dispose();
pictureBox.BackgroundImage = newImage;
}
}
}

4
Tests/ACSE.Tests/ChecksumTests.cs
View file

@ -29,13 +29,13 @@ public void TestCRC32Checksum()
[TestMethod]
public void TestNewLeafCRC32Type1()
{
Assert.AreEqual(new NewLeafCRC32Type1().Calculate(TestBuffer), 0xE764E245);
Assert.AreEqual(new NewLeafCRC32Reflected().Calculate(TestBuffer), 0xE764E245);
}
[TestMethod]
public void TestNewLeafCRC32Type2()
{
Assert.AreEqual(new NewLeafCRC32Type2().Calculate(TestBuffer), 0xDC89E85C);
Assert.AreEqual(new NewLeafCRC32Normal().Calculate(TestBuffer), 0xDC89E85C);
}
}
}