1 files changed, 5 insertions, 11 deletions
diff --git a/pokemod/PokemonItem.cpp b/pokemod/PokemonItem.cpp
index 1e18b6ca..f84a3b52 100644
--- a/pokemod/PokemonItem.cpp
+++ b/pokemod/PokemonItem.cpp
@@ -28,7 +28,7 @@ extern PokeGen::PokeMod::Pokemod curPokeMod;
 PokeGen::PokeMod::PokemonItem::PokemonItem(const unsigned _id)
 {
    LogCtor("PokemonItem", _id);
-   item = -1;
+   item = UINT_MAX;
    weight = 1;
    id = _id;
 }
@@ -48,7 +48,6 @@ PokeGen::PokeMod::PokemonItem::~PokemonItem()
 
 void PokeGen::PokeMod::PokemonItem::Validate()
 {
-   isValid = true;
    LogValidateStart("PokemonItem Validation: Starting", PM_DEBUG_INFO);
    if (!curPokeMod.GetItem(item))
    {
@@ -66,7 +65,6 @@ void PokeGen::PokeMod::PokemonItem::Validate()
 #ifdef PG_DEBUG_WINDOW
 void PokeGen::PokeMod::PokemonItem::Validate(const wxListBox &output)
 {
-   isValid = true;
    LogValidateStart("PokemonItem Validation: Starting", PM_DEBUG_INFO);
    if (!curPokeMod.GetItem(item))
    {
@@ -96,7 +94,7 @@ void PokeGen::PokeMod::PokemonItem::ImportIni(Ini &ini, const unsigned _id)
    }
    else
       id = _id;
-   ini.GetValue("item", item, -1);
+   ini.GetValue("item", item);
    ini.GetValue("weight", weight, 1);
    LogImportOver("PokemonItem", id);
 }
@@ -113,15 +111,11 @@ void PokeGen::PokeMod::PokemonItem::ExportIni(std::ofstream &fout, const String
    LogExportOver("PokemonItem", id);
 }
 
-void PokeGen::PokeMod::PokemonItem::SetItem(const int i)
+void PokeGen::PokeMod::PokemonItem::SetItem(const unsigned i)
 {
+   LogSetVar("PokemonItem", id, "item", curPokeMod.GetItem(i)->GetName());
    if (curPokeMod.GetItem(i))
-   {
-      LogSetVar("PokemonItem", id, "item", curPokeMod.GetItem(i)->GetName());
       item = i;
-   }
-   else
-      LogOutOfRange("PokemonItem", id, "item", i, "");
 }
 
 void PokeGen::PokeMod::PokemonItem::SetItem(const String &i)
@@ -138,7 +132,7 @@ void PokeGen::PokeMod::PokemonItem::SetWeight(const unsigned w)
       weight = w;
 }
 
-int PokeGen::PokeMod::PokemonItem::GetItem() const
+unsigned PokeGen::PokeMod::PokemonItem::GetItem() const
 {
    LogFetchVar("PokemonItem", id, "item", item);
    return item;