Leahnaya/NLSE
1
0
Fork 0
mirror of https://github.com/kwsch/NLSE.git synced 2026-09-07 10:55:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix importing RAM

Browse Source 
Fixed reference error too (thanks SciresM!)
This commit is contained in:
Kurt
2015-08-22 16:13:32 -07:00
parent 217d64b63c
commit 872079a2ac
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Subforms/Garden.cs
View File

@@ -31,7 +31,6 @@ public Garden()
CB_Item.DataSource = new BindingSource(Main.itemList, null);
TB_Flag1.KeyPress += EnterKey;
TB_Flag2.KeyPress += EnterKey;
Save = new GardenData(Main.SaveData);
#region Array Initialization
TownAcres = new[]
{
@@ -89,12 +88,11 @@ public Garden()
#endregion
// Load
loadData();
populateBuildingList();
reloadCurrentItem(currentItem);
}
private void B_Save_Click(object sender, EventArgs e)
{
saveData();
Main.SaveData = saveData();
Close();
}
private void B_Cancel_Click(object sender, EventArgs e)
@@ -124,10 +122,11 @@ private void B_Import_Click(object sender, EventArgs e)
byte[] data = File.ReadAllBytes(ofd.FileName);
Array.Copy(data, 0, Save.Data, 0x80, Save.Data.Length - 0x80);
loaded = false;
loadData();
}
private void B_Export_Click(object sender, EventArgs e)
{
saveData();
var sfd = new SaveFileDialog
{
FileName = "acnlram.bin",
@@ -136,7 +135,7 @@ private void B_Export_Click(object sender, EventArgs e)
if (sfd.ShowDialog() != DialogResult.OK)
return;
byte[] RAM = Save.Data.Skip(0x80).ToArray();
byte[] RAM = saveData().Skip(0x80).ToArray();
Array.Resize(ref RAM, 0x80000);
File.WriteAllBytes(sfd.FileName, RAM);
@@ -337,6 +336,8 @@ public byte[] Write()
// Data Usage
private void loadData()
{
Save = new GardenData(Main.SaveData);
// Load Players
Players = new Player[4];
for (int i = 0; i < Players.Length; i++)
@@ -367,6 +368,8 @@ private void loadData()
for (int i = 0; i < Buildings.Length; i++)
Buildings[i] = new Building(Save.Data.Skip(0x0495A8 + i * 4).Take(4).ToArray());
populateBuildingList();
// Load Villagers
Villagers = new Villager[10];
for (int i = 0; i < Villagers.Length; i++)
@@ -389,7 +392,7 @@ private void loadData()
}
loaded = true;
}
private void saveData()
private byte[] saveData()
{
// Temporary
for (int i = 0; i < 1 /*Players.Length */; i++)
@@ -436,7 +439,7 @@ private void saveData()
Save.PlayDays = (ushort)NUD_OverallDays.Value;
}
// Finish
Main.SaveData = Save.Write();
return Save.Write();
}
private int currentPlayer = -1;
@@ -622,7 +625,7 @@ private void clickTown(object sender, MouseEventArgs e)
reloadCurrentItem(TownItems[index]);
else // Write
{
TownItems[index] = currentItem;
TownItems[index] = copyCurrentItem();
int zX = (X - 16) / 16;
int zY = (Y - 16) / 16;
int zAcre = zX + zY * 5;
@@ -645,7 +648,7 @@ private void clickIsland(object sender, MouseEventArgs e)
reloadCurrentItem(IslandItems[index]);
else // Write
{
IslandItems[index] = currentItem;
IslandItems[index] = copyCurrentItem();
int zX = (X - 16) / 16;
int zY = (Y - 16) / 16;
int zAcre = zX + zY * 2;
@@ -716,12 +719,12 @@ private void clickCustom(object sender, MouseEventArgs e)
{
if (pocket)
{
Players[currentPlayer].Pockets[index] = currentItem;
Players[currentPlayer].Pockets[index] = copyCurrentItem();
PB_Pocket.Image = getItemPic(16, 16, Players[currentPlayer].Pockets);
}
else if (dress)
{
Players[currentPlayer].Dressers[index] = currentItem;
Players[currentPlayer].Dressers[index] = copyCurrentItem();
if (dress1)
PB_Dresser1.Image = getItemPic(16, 5, Players[currentPlayer].Dressers.Take(Players[currentPlayer].Dressers.Length / 2).ToArray());
else
@@ -729,14 +732,14 @@ private void clickCustom(object sender, MouseEventArgs e)
}
else if (island)
{
Players[currentPlayer].IslandBox[index] = currentItem;
Players[currentPlayer].IslandBox[index] = copyCurrentItem();
PB_Island.Image = getItemPic(16, 5, Players[currentPlayer].IslandBox);
}
}
}
private void reloadCurrentItem(Item item)
{
currentItem = item;
currentItem = new Item(item.Write());
CB_Item.SelectedValue = (int)item.ID;
TB_Flag1.Text = item.Flag1.ToString("X2");
TB_Flag2.Text = item.Flag2.ToString("X2");
@@ -749,6 +752,10 @@ private void hoverItem(Item item, int X, int Y)
X.ToString("00"), Y.ToString("00"),
itemName);
}
private Item copyCurrentItem()
{
return new Item(currentItem.Write());
}
private int getItemIndex(int X, int Y, int width)
{