diff options
Diffstat (limited to 'pokemod/CoinListObject.cpp')
| -rw-r--r-- | pokemod/CoinListObject.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pokemod/CoinListObject.cpp b/pokemod/CoinListObject.cpp index 1a59c40a..d3a45d7b 100644 --- a/pokemod/CoinListObject.cpp +++ b/pokemod/CoinListObject.cpp @@ -22,6 +22,8 @@ #include "CoinListObject.h" +const char* PokeGen::PokeMod::CoinListObject::TypeStr[PokeGen::PokeMod::CoinListObject::End] = {"Item", "Pokémon"}; + PokeGen::PokeMod::CoinListObject::CoinListObject(const Pokemod* par, const unsigned _id) : Object(_id, par), type(Item), @@ -50,9 +52,9 @@ bool PokeGen::PokeMod::CoinListObject::Validate() } else if (type == Pokemon) { - if (pokemod->GetPokemonByID(object) == UINT_MAX) + if (pokemod->GetSpeciesByID(object) == UINT_MAX) { - pokemod->ValidationMsg("Invalid Pokémon"); + pokemod->ValidationMsg("Invalid Species"); isValid = false; } } @@ -104,7 +106,7 @@ bool PokeGen::PokeMod::CoinListObject::SetType(const unsigned t) bool PokeGen::PokeMod::CoinListObject::SetObject(const unsigned o) { - if (((type == Item) && (pokemod->GetItemByID(o) != UINT_MAX)) || ((type == Pokemon) && (pokemod->GetPokemonByID(o) != UINT_MAX))) + if (((type == Item) && (pokemod->GetItemByID(o) != UINT_MAX)) || ((type == Pokemon) && (pokemod->GetSpeciesByID(o) != UINT_MAX))) object = o; return (object == o); } |