Leahnaya/pk3DS
1
0
Fork 0
mirror of https://github.com/kwsch/pk3DS.git synced 2026-04-25 07:37:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust offset detection

Browse Source 
make static, remove references
too bad & hasty ew
#147
This commit is contained in:
Kurt 2017-07-10 22:24:45 -07:00
parent 9b85a93694
commit 62b19aa99a
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pk3DS/Subforms/Gen6/MartEditor6.cs
View File

@ -15,7 +15,7 @@ public MartEditor6()
if (!File.Exists(files[0]) || !Path.GetFileNameWithoutExtension(files[0]).Contains("code")) { WinFormsUtil.Alert("No .code.bin detected."); Close(); }
data = File.ReadAllBytes(files[0]);
if (data.Length % 0x200 != 0) { WinFormsUtil.Alert(".code.bin not decompressed. Aborting."); Close(); }
offset = GetDataOffset();
offset = GetDataOffset(data);
codebin = files[0];
itemlist[0] = "";
setupDGV();
@ -23,26 +23,26 @@ public MartEditor6()
CB_Location.SelectedIndex = 0;
}
private int GetDataOffset()
private static int GetDataOffset(byte[] data)
{
byte[] vanilla =
{
0x00, 0x72, 0x6F, 0x6D, 0x3A, 0x2F, 0x44, 0x6C, 0x6C, 0x53, 0x74, 0x61, 0x72, 0x74, 0x4D, 0x65,
0x6E, 0x75, 0x2E, 0x63, 0x72, 0x6F, 0x00
};
int o = Util.IndexOfBytes(data, vanilla, 0x400000, 0);
int offset = Util.IndexOfBytes(data, vanilla, 0x400000, 0);
if (offset >= 0)
return o + vanilla.Length;
return offset + vanilla.Length;
byte[] patched =
{
0x00, 0x72, 0x6F, 0x6D, 0x32, 0x3A, 0x2F, 0x44, 0x6C, 0x6C, 0x53, 0x74, 0x61, 0x72, 0x74, 0x4D,
0x65, 0x6E, 0x75, 0x2E, 0x63, 0x72, 0x6F, 0x00
};
o = Util.IndexOfBytes(data, patched, 0x400000, 0);
offset = Util.IndexOfBytes(data, patched, 0x400000, 0);
if (offset >= 0)
return o + patched.Length;
return offset + patched.Length;
return -1;
}

12
pk3DS/Subforms/Gen6/TutorEditor6.cs
View File

@ -15,7 +15,7 @@ public TutorEditor6()
if (!File.Exists(files[0]) || !Path.GetFileNameWithoutExtension(files[0]).Contains("code")) { WinFormsUtil.Alert("No .code.bin detected."); Close(); }
data = File.ReadAllBytes(files[0]);
if (data.Length % 0x200 != 0) { WinFormsUtil.Alert(".code.bin not decompressed. Aborting."); Close(); }
offset = GetDataOffset();
offset = GetDataOffset(data);
codebin = files[0];
movelist[0] = "";
setupDGV();
@ -24,16 +24,16 @@ public TutorEditor6()
WinFormsUtil.Alert("Changes made do not reflect ingame.", "Still needs more research.");
}
private int GetDataOffset()
private static int GetDataOffset(byte[] data)
{
byte[] vanilla =
{
0x00, 0x46, 0x6F, 0x72, 0x6D, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x00, 0x00, 0x45, 0x64, 0x67,
0x65, 0x49, 0x44, 0x00, 0xFF
};
int o = Util.IndexOfBytes(data, vanilla, 0x400000, 0);
int offset = Util.IndexOfBytes(data, vanilla, 0x400000, 0);
if (offset >= 0)
return o + vanilla.Length;
return offset + vanilla.Length;
byte[] patched =
{
@ -44,10 +44,10 @@ private int GetDataOffset()
0x79, 0x73, 0x74, 0x65, 0x6D, 0x2F, 0x6D, 0x6F, 0x74, 0x69, 0x6F, 0x6E, 0x2F, 0x4D, 0x6F, 0x74,
0x69, 0x6F, 0x6E, 0x2E, 0x63, 0x70, 0x70, 0x00, 0x00
};
o = Util.IndexOfBytes(data, patched, 0x400000, 0);
offset = Util.IndexOfBytes(data, patched, 0x400000, 0);
if (offset >= 0)
return o + patched.Length;
return offset + patched.Length;
return -1;
}