Leahnaya/BW_tool
1
0
Fork 0
mirror of https://github.com/suloku/BW_tool.git synced 2026-09-07 08:36:19 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/suloku/BW_tool

Browse Source 
# Conflicts:
#	BW_tool/Editors/MemoryLink.cs
This commit is contained in:
suloku
2021-03-13 20:05:05 +01:00
parent c6a5c76d19 c7a614e43c
commit 604db467ea
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
BW_tool/Editors/MemoryLink.cs
View File

@@ -464,7 +464,11 @@ namespace BW_tool
.Replace("\u0027", "\u2019") // farfetch'd
.PadRight(value.Length + 1, (char)0xFFFF); // Null Terminator
Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x48);
<<<<<<< HEAD
Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x60);
=======
Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x60);
>>>>>>> c7a614e43c4d6acb87729f42682fbc8dc902cb2b
Encoding.Unicode.GetBytes(TempNick).CopyTo(Data, 0x78);
}
}
@@ -477,7 +481,11 @@ namespace BW_tool
set
{
setData(BitConverter.GetBytes((UInt16)value), 0x44);
<<<<<<< HEAD
setData(BitConverter.GetBytes((UInt16)value), 0x5C);
=======
setData(BitConverter.GetBytes((UInt16)value), 0x5C);
>>>>>>> c7a614e43c4d6acb87729f42682fbc8dc902cb2b
setData(BitConverter.GetBytes((UInt16)value), 0x74);
}
}
@@ -490,7 +498,11 @@ namespace BW_tool
set
{
setData(BitConverter.GetBytes((UInt16)value), 0x46);
<<<<<<< HEAD
setData(BitConverter.GetBytes((UInt16)value), 0x5E);
=======
setData(BitConverter.GetBytes((UInt16)value), 0x5E);
>>>>>>> c7a614e43c4d6acb87729f42682fbc8dc902cb2b
setData(BitConverter.GetBytes((UInt16)value), 0x76);
}
}