diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index 9e0513497..c4f43503f 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -3708,7 +3708,8 @@ private void mainmenuCodeGen(object sender, EventArgs e) private void mainmenuBoxReport(object sender, EventArgs e) { frmReport ReportForm = new frmReport(); - ReportForm.PopulateData(savefile, savindex); + int offset = 0x27A00; if (savegame_oras) offset = 0x33000 + 0x5400; + ReportForm.PopulateData(savefile, savindex, offset); ReportForm.ShowDialog(); } // Main Menu Subfunctions // diff --git a/SAV/frmReport.cs b/SAV/frmReport.cs index ae3e172ab..f34f271b4 100644 --- a/SAV/frmReport.cs +++ b/SAV/frmReport.cs @@ -14,15 +14,12 @@ namespace PKHeX public partial class frmReport : Form { private byte[] SaveData; - private const int PIDOFFSET = 0x18; - private const int TIDOFFSET = 0x0C; - private const int SIDOFFSET = 0x0E; public frmReport() { InitializeComponent(); dgData.DoubleBuffered(true); } - public void PopulateData(byte[] InputData, int savindex) + public void PopulateData(byte[] InputData, int savindex, int baseoffset) { SaveData = new byte[InputData.Length]; Array.Copy(InputData, SaveData, InputData.Length); @@ -31,7 +28,7 @@ public void PopulateData(byte[] InputData, int savindex) if (savindex > 1) savindex = 0; for (int BoxNum = 0; BoxNum < 31; BoxNum++) { - int boxoffset = 0x27A00 + 0x7F000 * savindex + BoxNum * (0xE8 * 30); + int boxoffset = baseoffset + 0x7F000 * savindex + BoxNum * (0xE8 * 30); for (int SlotNum = 0; SlotNum < 30; SlotNum++) { int offset = boxoffset + 0xE8 * SlotNum;