From 3c4d845dfd3e242ebac187e7b1295c34b886da61 Mon Sep 17 00:00:00 2001 From: Kurt Date: Wed, 12 Apr 2017 22:57:46 -0700 Subject: [PATCH] Fix species off by one len(0+maxspecies) == maxspecies+1 now matches other usages --- pk3DS/Subforms/Gen6/EvolutionEditor6.cs | 2 +- pk3DS/Subforms/Gen6/GiftEditor6.cs | 2 +- pk3DS/Subforms/Gen6/MaisonEditor6.cs | 2 +- pk3DS/Subforms/Gen6/RSTE.cs | 2 +- pk3DS/Subforms/Gen6/StarterEditor6.cs | 2 +- pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs | 2 +- pk3DS/Subforms/Gen7/MaisonEditor7.cs | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pk3DS/Subforms/Gen6/EvolutionEditor6.cs b/pk3DS/Subforms/Gen6/EvolutionEditor6.cs index 4a1b6ac..09a6934 100644 --- a/pk3DS/Subforms/Gen6/EvolutionEditor6.cs +++ b/pk3DS/Subforms/Gen6/EvolutionEditor6.cs @@ -17,7 +17,7 @@ public EvolutionEditor6(byte[][] infiles) InitializeComponent(); specieslist[0] = movelist[0] = itemlist[0] = ""; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); string[] evolutionMethods = { diff --git a/pk3DS/Subforms/Gen6/GiftEditor6.cs b/pk3DS/Subforms/Gen6/GiftEditor6.cs index e504005..074b730 100644 --- a/pk3DS/Subforms/Gen6/GiftEditor6.cs +++ b/pk3DS/Subforms/Gen6/GiftEditor6.cs @@ -10,7 +10,7 @@ public partial class GiftEditor6 : Form public GiftEditor6() { specieslist[0] = "---"; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); if (!File.Exists(FieldPath)) { Util.Error("CRO does not exist! Closing.", FieldPath); diff --git a/pk3DS/Subforms/Gen6/MaisonEditor6.cs b/pk3DS/Subforms/Gen6/MaisonEditor6.cs index cfa0022..83a9f21 100644 --- a/pk3DS/Subforms/Gen6/MaisonEditor6.cs +++ b/pk3DS/Subforms/Gen6/MaisonEditor6.cs @@ -14,7 +14,7 @@ public MaisonEditor6(byte[][] trd, byte[][] trp, bool super) { trFiles = trd; pkFiles = trp; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); movelist[0] = specieslist[0] = itemlist[0] = ""; trNames = Main.getText(super ? TextName.SuperTrainerNames : TextName.MaisonTrainerNames); Array.Resize(ref trNames, trFiles.Length); diff --git a/pk3DS/Subforms/Gen6/RSTE.cs b/pk3DS/Subforms/Gen6/RSTE.cs index 24f1ea8..bca8725 100644 --- a/pk3DS/Subforms/Gen6/RSTE.cs +++ b/pk3DS/Subforms/Gen6/RSTE.cs @@ -16,7 +16,7 @@ public RSTE(byte[][] trc, byte[][] trd, byte[][] trp) trclass = trc; trdata = trd; trpoke = trp; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); InitializeComponent(); // String Fetching diff --git a/pk3DS/Subforms/Gen6/StarterEditor6.cs b/pk3DS/Subforms/Gen6/StarterEditor6.cs index c1816de..6ab884a 100644 --- a/pk3DS/Subforms/Gen6/StarterEditor6.cs +++ b/pk3DS/Subforms/Gen6/StarterEditor6.cs @@ -9,7 +9,7 @@ public partial class StarterEditor6 : Form public StarterEditor6() { specieslist[0] = "---"; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); if (!File.Exists(CROPath)) { diff --git a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs index c87a513..ab34ed1 100644 --- a/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs +++ b/pk3DS/Subforms/Gen6/StaticEncounterEditor6.cs @@ -10,7 +10,7 @@ public partial class StaticEncounterEditor6 : Form public StaticEncounterEditor6() { specieslist[0] = "---"; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); if (!File.Exists(FieldPath)) { Util.Error("CRO does not exist! Closing.", FieldPath); diff --git a/pk3DS/Subforms/Gen7/MaisonEditor7.cs b/pk3DS/Subforms/Gen7/MaisonEditor7.cs index c743813..025c1d7 100644 --- a/pk3DS/Subforms/Gen7/MaisonEditor7.cs +++ b/pk3DS/Subforms/Gen7/MaisonEditor7.cs @@ -14,7 +14,7 @@ public MaisonEditor7(byte[][] trd, byte[][] trp, bool royal) { trFiles = trd; pkFiles = trp; - Array.Resize(ref specieslist, Main.Config.MaxSpeciesID); + Array.Resize(ref specieslist, Main.Config.MaxSpeciesID + 1); movelist[0] = specieslist[0] = itemlist[0] = ""; trNames = Main.getText(royal ? TextName.BattleRoyalNames : TextName.BattleTreeNames); Array.Resize(ref trNames, trFiles.Length);