diff --git a/NHSE.Core/Hashing/FileHashRegion.cs b/NHSE.Core/Hashing/FileHashRegion.cs index 5d16c0c..e6de040 100644 --- a/NHSE.Core/Hashing/FileHashRegion.cs +++ b/NHSE.Core/Hashing/FileHashRegion.cs @@ -10,16 +10,16 @@ /// public readonly int HashOffset; - /// - /// Offset where the data to be hashed starts at. - /// - public readonly int BeginOffset; - /// /// Length of the hashed data. /// public readonly int Size; + /// + /// Offset where the data to be hashed starts at (calculated). + /// + public int BeginOffset => HashOffset + 4; + /// /// Offset where the data to be hashed ends at (calculated). /// @@ -27,10 +27,9 @@ public override string ToString() => $"0x{HashOffset:X}: (0x{BeginOffset:X}-0x{EndOffset:X})"; - public FileHashRegion(int hashOfs, int begOfs, int size) + public FileHashRegion(int hashOfs, int size) { HashOffset = hashOfs; - BeginOffset = begOfs; Size = size; } diff --git a/NHSE.Core/Hashing/FileHashRevision.cs b/NHSE.Core/Hashing/FileHashRevision.cs index 05e7813..2f7434b 100644 --- a/NHSE.Core/Hashing/FileHashRevision.cs +++ b/NHSE.Core/Hashing/FileHashRevision.cs @@ -18,42 +18,42 @@ public static class FileHashRevision { new FileHashDetails("main.dat", MAIN_SAVE_SIZE, new[] { - new FileHashRegion(0x000108, 0x00010C, 0x1D6D4C), - new FileHashRegion(0x1D6E58, 0x1D6E5C, 0x323384), - new FileHashRegion(0x4FA2E8, 0x4FA2EC, 0x035AC4), - new FileHashRegion(0x52FDB0, 0x52FDB4, 0x03607C), - new FileHashRegion(0x565F38, 0x565F3C, 0x035AC4), - new FileHashRegion(0x59BA00, 0x59BA04, 0x03607C), - new FileHashRegion(0x5D1B88, 0x5D1B8C, 0x035AC4), - new FileHashRegion(0x607650, 0x607654, 0x03607C), - new FileHashRegion(0x63D7D8, 0x63D7DC, 0x035AC4), - new FileHashRegion(0x6732A0, 0x6732A4, 0x03607C), - new FileHashRegion(0x6A9428, 0x6A942C, 0x035AC4), - new FileHashRegion(0x6DEEF0, 0x6DEEF4, 0x03607C), - new FileHashRegion(0x715078, 0x71507C, 0x035AC4), - new FileHashRegion(0x74AB40, 0x74AB44, 0x03607C), - new FileHashRegion(0x780CC8, 0x780CCC, 0x035AC4), - new FileHashRegion(0x7B6790, 0x7B6794, 0x03607C), - new FileHashRegion(0x7EC918, 0x7EC91C, 0x035AC4), - new FileHashRegion(0x8223E0, 0x8223E4, 0x03607C), - new FileHashRegion(0x858460, 0x858464, 0x2684D4) + new FileHashRegion(0x000108, 0x1D6D4C), + new FileHashRegion(0x1D6E58, 0x323384), + new FileHashRegion(0x4FA2E8, 0x035AC4), + new FileHashRegion(0x52FDB0, 0x03607C), + new FileHashRegion(0x565F38, 0x035AC4), + new FileHashRegion(0x59BA00, 0x03607C), + new FileHashRegion(0x5D1B88, 0x035AC4), + new FileHashRegion(0x607650, 0x03607C), + new FileHashRegion(0x63D7D8, 0x035AC4), + new FileHashRegion(0x6732A0, 0x03607C), + new FileHashRegion(0x6A9428, 0x035AC4), + new FileHashRegion(0x6DEEF0, 0x03607C), + new FileHashRegion(0x715078, 0x035AC4), + new FileHashRegion(0x74AB40, 0x03607C), + new FileHashRegion(0x780CC8, 0x035AC4), + new FileHashRegion(0x7B6790, 0x03607C), + new FileHashRegion(0x7EC918, 0x035AC4), + new FileHashRegion(0x8223E0, 0x03607C), + new FileHashRegion(0x858460, 0x2684D4) }), new FileHashDetails("personal.dat", PERSONAL_SAVE_SIZE, new[] { - new FileHashRegion(0x00108, 0x0010C, 0x35AC4), - new FileHashRegion(0x35BD0, 0x35BD4, 0x3607C) + new FileHashRegion(0x00108, 0x35AC4), + new FileHashRegion(0x35BD0, 0x3607C) }), new FileHashDetails("postbox.dat", POSTBOX_SAVE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0xB4447C) + new FileHashRegion(0x000100, 0xB4447C) }), new FileHashDetails("photo_studio_island.dat", PHOTO_STUDIO_ISLAND_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x262B0) + new FileHashRegion(0x000100, 0x262B0) }), new FileHashDetails("profile.dat", PROFILE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x69404) + new FileHashRegion(0x000100, 0x69404) }), }); @@ -72,42 +72,42 @@ public static class FileHashRevision { new FileHashDetails("main.dat", REV_110_MAIN_SAVE_SIZE, new[] { - new FileHashRegion(0x000110, 0x000114, 0x1D6D5C), - new FileHashRegion(0x1D6E70, 0x1D6E74, 0x323C0C), - new FileHashRegion(0x4FAB90, 0x4FAB94, 0x035AFC), - new FileHashRegion(0x530690, 0x530694, 0x0362BC), - new FileHashRegion(0x566A60, 0x566A64, 0x035AFC), - new FileHashRegion(0x59C560, 0x59C564, 0x0362BC), - new FileHashRegion(0x5D2930, 0x5D2934, 0x035AFC), - new FileHashRegion(0x608430, 0x608434, 0x0362BC), - new FileHashRegion(0x63E800, 0x63E804, 0x035AFC), - new FileHashRegion(0x674300, 0x674304, 0x0362BC), - new FileHashRegion(0x6AA6D0, 0x6AA6D4, 0x035AFC), - new FileHashRegion(0x6E01D0, 0x6E01D4, 0x0362BC), - new FileHashRegion(0x7165A0, 0x7165A4, 0x035AFC), - new FileHashRegion(0x74C0A0, 0x74C0A4, 0x0362BC), - new FileHashRegion(0x782470, 0x782474, 0x035AFC), - new FileHashRegion(0x7B7F70, 0x7B7F74, 0x0362BC), - new FileHashRegion(0x7EE340, 0x7EE344, 0x035AFC), - new FileHashRegion(0x823E40, 0x823E44, 0x0362BC), - new FileHashRegion(0x85A100, 0x85A104, 0x26899C) + new FileHashRegion(0x000110, 0x1D6D5C), + new FileHashRegion(0x1D6E70, 0x323C0C), + new FileHashRegion(0x4FAB90, 0x035AFC), + new FileHashRegion(0x530690, 0x0362BC), + new FileHashRegion(0x566A60, 0x035AFC), + new FileHashRegion(0x59C560, 0x0362BC), + new FileHashRegion(0x5D2930, 0x035AFC), + new FileHashRegion(0x608430, 0x0362BC), + new FileHashRegion(0x63E800, 0x035AFC), + new FileHashRegion(0x674300, 0x0362BC), + new FileHashRegion(0x6AA6D0, 0x035AFC), + new FileHashRegion(0x6E01D0, 0x0362BC), + new FileHashRegion(0x7165A0, 0x035AFC), + new FileHashRegion(0x74C0A0, 0x0362BC), + new FileHashRegion(0x782470, 0x035AFC), + new FileHashRegion(0x7B7F70, 0x0362BC), + new FileHashRegion(0x7EE340, 0x035AFC), + new FileHashRegion(0x823E40, 0x0362BC), + new FileHashRegion(0x85A100, 0x26899C) }), new FileHashDetails("personal.dat", REV_110_PERSONAL_SAVE_SIZE, new[] { - new FileHashRegion(0x00110, 0x00114, 0x35AFC), - new FileHashRegion(0x35C10, 0x35C14, 0x362BC) + new FileHashRegion(0x00110, 0x35AFC), + new FileHashRegion(0x35C10, 0x362BC) }), new FileHashDetails("postbox.dat", REV_110_POSTBOX_SAVE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0xB4448C) + new FileHashRegion(0x000100, 0xB4448C) }), new FileHashDetails("photo_studio_island.dat", REV_110_PHOTO_STUDIO_ISLAND_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x262BC) + new FileHashRegion(0x000100, 0x262BC) }), new FileHashDetails("profile.dat", REV_110_PROFILE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x6945C) + new FileHashRegion(0x000100, 0x6945C) }), }); @@ -122,42 +122,42 @@ public static class FileHashRevision { new FileHashDetails("main.dat", REV_120_MAIN_SAVE_SIZE, new[] { - new FileHashRegion(0x000110, 0x000114, 0x1D6D5C), - new FileHashRegion(0x1D6E70, 0x1D6E74, 0x323EBC), - new FileHashRegion(0x4FAE40, 0x4FAE44, 0x035D2C), - new FileHashRegion(0x530B70, 0x530B74, 0x03787C), - new FileHashRegion(0x568500, 0x568504, 0x035D2C), - new FileHashRegion(0x59E230, 0x59E234, 0x03787C), - new FileHashRegion(0x5D5BC0, 0x5D5BC4, 0x035D2C), - new FileHashRegion(0x60B8F0, 0x60B8F4, 0x03787C), - new FileHashRegion(0x643280, 0x643284, 0x035D2C), - new FileHashRegion(0x678FB0, 0x678FB4, 0x03787C), - new FileHashRegion(0x6B0940, 0x6B0944, 0x035D2C), - new FileHashRegion(0x6E6670, 0x6E6674, 0x03787C), - new FileHashRegion(0x71E000, 0x71E004, 0x035D2C), - new FileHashRegion(0x753D30, 0x753D34, 0x03787C), - new FileHashRegion(0x78B6C0, 0x78B6C4, 0x035D2C), - new FileHashRegion(0x7C13F0, 0x7C13F4, 0x03787C), - new FileHashRegion(0x7F8D80, 0x7F8D84, 0x035D2C), - new FileHashRegion(0x82EAB0, 0x82EAB4, 0x03787C), - new FileHashRegion(0x866330, 0x866334, 0x26899C) + new FileHashRegion(0x000110, 0x1D6D5C), + new FileHashRegion(0x1D6E70, 0x323EBC), + new FileHashRegion(0x4FAE40, 0x035D2C), + new FileHashRegion(0x530B70, 0x03787C), + new FileHashRegion(0x568500, 0x035D2C), + new FileHashRegion(0x59E230, 0x03787C), + new FileHashRegion(0x5D5BC0, 0x035D2C), + new FileHashRegion(0x60B8F0, 0x03787C), + new FileHashRegion(0x643280, 0x035D2C), + new FileHashRegion(0x678FB0, 0x03787C), + new FileHashRegion(0x6B0940, 0x035D2C), + new FileHashRegion(0x6E6670, 0x03787C), + new FileHashRegion(0x71E000, 0x035D2C), + new FileHashRegion(0x753D30, 0x03787C), + new FileHashRegion(0x78B6C0, 0x035D2C), + new FileHashRegion(0x7C13F0, 0x03787C), + new FileHashRegion(0x7F8D80, 0x035D2C), + new FileHashRegion(0x82EAB0, 0x03787C), + new FileHashRegion(0x866330, 0x26899C) }), new FileHashDetails("personal.dat", REV_120_PERSONAL_SAVE_SIZE, new[] { - new FileHashRegion(0x00110, 0x00114, 0x35D2C), - new FileHashRegion(0x35E40, 0x35E44, 0x3787C) + new FileHashRegion(0x00110, 0x35D2C), + new FileHashRegion(0x35E40, 0x3787C) }), new FileHashDetails("postbox.dat", REV_120_POSTBOX_SAVE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0xB4448C) + new FileHashRegion(0x000100, 0xB4448C) }), new FileHashDetails("photo_studio_island.dat", REV_120_PHOTO_STUDIO_ISLAND_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x2C8BC) + new FileHashRegion(0x000100, 0x2C8BC) }), new FileHashDetails("profile.dat", REV_120_PROFILE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x6945C) + new FileHashRegion(0x000100, 0x6945C) }), }); @@ -172,42 +172,42 @@ public static class FileHashRevision { new FileHashDetails("main.dat", REV_130_MAIN_SAVE_SIZE, new[] { - new FileHashRegion(0x000110, 0x000114, 0x1D6D5C), - new FileHashRegion(0x1D6E70, 0x1D6E74, 0x323EBC), - new FileHashRegion(0x4FAE40, 0x4FAE44, 0x035D2C), - new FileHashRegion(0x530B70, 0x530B74, 0x03787C), - new FileHashRegion(0x568500, 0x568504, 0x035D2C), - new FileHashRegion(0x59E230, 0x59E234, 0x03787C), - new FileHashRegion(0x5D5BC0, 0x5D5BC4, 0x035D2C), - new FileHashRegion(0x60B8F0, 0x60B8F4, 0x03787C), - new FileHashRegion(0x643280, 0x643284, 0x035D2C), - new FileHashRegion(0x678FB0, 0x678FB4, 0x03787C), - new FileHashRegion(0x6B0940, 0x6B0944, 0x035D2C), - new FileHashRegion(0x6E6670, 0x6E6674, 0x03787C), - new FileHashRegion(0x71E000, 0x71E004, 0x035D2C), - new FileHashRegion(0x753D30, 0x753D34, 0x03787C), - new FileHashRegion(0x78B6C0, 0x78B6C4, 0x035D2C), - new FileHashRegion(0x7C13F0, 0x7C13F4, 0x03787C), - new FileHashRegion(0x7F8D80, 0x7F8D84, 0x035D2C), - new FileHashRegion(0x82EAB0, 0x82EAB4, 0x03787C), - new FileHashRegion(0x866330, 0x866334, 0x26899C) + new FileHashRegion(0x000110, 0x1D6D5C), + new FileHashRegion(0x1D6E70, 0x323EEC), + new FileHashRegion(0x4FAE70, 0x035D2C), + new FileHashRegion(0x530BA0, 0x03788C), + new FileHashRegion(0x568540, 0x035D2C), + new FileHashRegion(0x59E270, 0x03788C), + new FileHashRegion(0x5D5c10, 0x035D2C), + new FileHashRegion(0x60B940, 0x03788C), + new FileHashRegion(0x6432E0, 0x035D2C), + new FileHashRegion(0x679010, 0x03788C), + new FileHashRegion(0x6B09B0, 0x035D2C), + new FileHashRegion(0x6E66E0, 0x03788C), + new FileHashRegion(0x71E080, 0x035D2C), + new FileHashRegion(0x753DB0, 0x03788C), + new FileHashRegion(0x78B750, 0x035D2C), + new FileHashRegion(0x7C1480, 0x03788C), + new FileHashRegion(0x7F8E20, 0x035D2C), + new FileHashRegion(0x82EB50, 0x03788C), + new FileHashRegion(0x8663E0, 0x26899C) }), new FileHashDetails("personal.dat", REV_130_PERSONAL_SAVE_SIZE, new[] { - new FileHashRegion(0x00110, 0x00114, 0x35D2C), - new FileHashRegion(0x35E40, 0x35E44, 0x3787C) + new FileHashRegion(0x00110, 0x35D2C), + new FileHashRegion(0x35E40, 0x3788C) }), new FileHashDetails("postbox.dat", REV_130_POSTBOX_SAVE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0xB4448C) + new FileHashRegion(0x000100, 0xB4448C) }), new FileHashDetails("photo_studio_island.dat", REV_130_PHOTO_STUDIO_ISLAND_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x2C8BC) + new FileHashRegion(0x000100, 0x2C8BC) }), new FileHashDetails("profile.dat", REV_130_PROFILE_SIZE, new[] { - new FileHashRegion(0x000100, 0x00104, 0x6945C) + new FileHashRegion(0x000100, 0x6945C) }), });