From c7fd04f4cf980e90f0c655bcc294c56d1c7d2731 Mon Sep 17 00:00:00 2001 From: Kaphotics Date: Tue, 3 May 2016 20:24:35 -0700 Subject: [PATCH] Minor fixes First init with X/Y, path won't change if ORAS is loaded. Fixed. --- pk3DS/Subforms/Gifts.cs | 2 +- pk3DS/Subforms/Starters.cs | 4 ++-- pk3DS/Subforms/TypeChart.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pk3DS/Subforms/Gifts.cs b/pk3DS/Subforms/Gifts.cs index 97a07d2..45d386c 100644 --- a/pk3DS/Subforms/Gifts.cs +++ b/pk3DS/Subforms/Gifts.cs @@ -30,7 +30,7 @@ public Gifts() loadData(); } - internal static readonly string FieldPath = Path.Combine(Main.RomFSPath, "DllField.cro"); + private readonly string FieldPath = Path.Combine(Main.RomFSPath, "DllField.cro"); private byte[] FieldData; private readonly int fieldOffset = Main.oras ? 0xF906C : 0xF805C; private readonly int fieldSize = Main.oras ? 0x24 : 0x18; diff --git a/pk3DS/Subforms/Starters.cs b/pk3DS/Subforms/Starters.cs index 7069243..5751776 100644 --- a/pk3DS/Subforms/Starters.cs +++ b/pk3DS/Subforms/Starters.cs @@ -49,8 +49,8 @@ public Starters() Width = Main.oras ? Width : Width/2 + 2; loadData(); } - internal static string CROPath = Path.Combine(Main.RomFSPath, "DllPoke3Select.cro"); - internal static string FieldPath = Path.Combine(Main.RomFSPath, "DllField.cro"); + private readonly string CROPath = Path.Combine(Main.RomFSPath, "DllPoke3Select.cro"); + private readonly string FieldPath = Path.Combine(Main.RomFSPath, "DllField.cro"); private readonly string[] specieslist = Main.getText(Main.oras ? 98 : 80); private readonly ComboBox[][] Choices; private readonly PictureBox[][] Previews; diff --git a/pk3DS/Subforms/TypeChart.cs b/pk3DS/Subforms/TypeChart.cs index 7138b13..dd63b4a 100644 --- a/pk3DS/Subforms/TypeChart.cs +++ b/pk3DS/Subforms/TypeChart.cs @@ -8,7 +8,7 @@ namespace pk3DS { public partial class TypeChart : Form { - internal static string CROPath = Path.Combine(Main.RomFSPath, "DllBattle.cro"); + private readonly string CROPath = Path.Combine(Main.RomFSPath, "DllBattle.cro"); private readonly string[] types = Main.getText(Main.oras ? 18 : 17); private readonly int offset = Main.oras ? 0x000DB428 : 0x000D12A8; private readonly byte[] chart = new byte[0x144];