1 files changed, 8 insertions, 11 deletions
diff --git a/pokemod/MapTrainerTeam.cpp b/pokemod/MapTrainerTeam.cpp
index f9b3e781..239210bb 100644
--- a/pokemod/MapTrainerTeam.cpp
+++ b/pokemod/MapTrainerTeam.cpp
@@ -53,20 +53,17 @@ void PokeGen::PokeMod::MapTrainerTeam::Validate()
    LogValidateStart("MapTrainerTeam", id);
    if (!curPokeMod.GetPokemon(species))
    {
-      LogVarNotValid("MapTrainerTeam", id, "species", species);
-      output.Append(ConsoleLogVarNotValid("MapTrainerTeam", id, "species", species));
+      LogVarNotValid("MapTrainerTeam", id, "species");
       isValid = false;
    }
    if (curPokeMod.GetMaxLevel() <= level)
    {
-      LogVarOutOfRange("MapTrainerTeam", id, "level", level, GetSpeciesString());
-      output.Append(ConsoleLogVarOutOfRange("MapTrainerTeam", id, "level", level, GetSpeciesString()));
+      LogOutOfRange("MapTrainerTeam", id, "level", level, GetSpeciesString());
       isValid = false;
    }
    if ((item != -1) && !curPokeMod.GetItem(item))
    {
-      LogVarNotValid("MapTrainerTeam", id, "item", item);
-      output.Append(ConsoleLogVarNotValid("MapTrainerTeam", id, "item", item));
+      LogVarNotValid("MapTrainerTeam", id, "item");
       isValid = false;
    }
    LogValidateOver("MapTrainerTeam", id, isValid, GetSpeciesString());
@@ -117,7 +114,7 @@ void PokeGen::PokeMod::MapTrainerTeam::ImportIni(Ini &ini, const unsigned _id)
    LogImportOver("MapTrainerTeam", id);
 }
 
-void PokeGen::PokeMod::MapTrainerTeam::ExportIni(Ini &ini, const String &map, const unsigned trainerId) const
+void PokeGen::PokeMod::MapTrainerTeam::ExportIni(std::ofstream &fout, const String &map, const unsigned trainerId) const
 {
    LogExportStart("MapTrainerTeam", id);
    // Make elements
@@ -161,8 +158,8 @@ void PokeGen::PokeMod::MapTrainerTeam::SetItem(const int i)
 void PokeGen::PokeMod::MapTrainerTeam::SetItem(const String &i)
 {
    LogSetVar("MapTrainerTeam", id, "item string", i, GetSpeciesString());
-   if (Item *item = curPokeMod.GetItem(i))
-      item = item->GetId();
+   if (Item *temp = curPokeMod.GetItem(i))
+      item = temp->GetId();
 }
 
 int PokeGen::PokeMod::MapTrainerTeam::GetSpecies() const
@@ -181,13 +178,13 @@ PokeGen::PokeMod::String PokeGen::PokeMod::MapTrainerTeam::GetSpeciesString() co
 
 unsigned PokeGen::PokeMod::MapTrainerTeam::GetLevel() const
 {
-   LogFetchVar("MapTrainerTeam", id, "level", level, GetSpeceisString());
+   LogFetchVar("MapTrainerTeam", id, "level", level, GetSpeciesString());
    return level;
 }
 
 int PokeGen::PokeMod::MapTrainerTeam::GetItem() const
 {
-   LogFetchVar("MapTrainerTeam", id, "item", item, GetSpeceisString());
+   LogFetchVar("MapTrainerTeam", id, "item", item, GetSpeciesString());
    return item;
 }