Merged CHECK macro branch

1 files changed, 5 insertions, 6 deletions

diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp
index 3159ad5e..6309c1d7 100644
--- a/sigscript/MapTrainerTeamMemberWrapper.cpp
+++ b/sigscript/MapTrainerTeamMemberWrapper.cpp
@@ -43,14 +43,13 @@ Sigscript::SpeciesWrapper* Sigscript::MapTrainerTeamMemberWrapper::species()
 
 int Sigscript::MapTrainerTeamMemberWrapper::level() const
 {
-    if (sigmod()->singlePlayer() && hasValueOfType<int>("level"))
-        return valueOfType<int>("level");
+    ALLOW_OVERRIDE_SO(teamMember, int, level);
     return m_teamMember->level();
 }
 
 QList<Sigscript::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilities()
 {
-    QList<int> abilityIds = m_teamMember->abilities();
+    QList<int> abilityIds = m_teamMember->ability();
     QList<AbilityWrapper*> abilities;
     foreach (int id, abilityIds)
         abilities.append(sigmod()->ability(id));
@@ -59,7 +58,7 @@ QList<Sigscript::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilit
 
 QList<Sigscript::ItemWrapper*> Sigscript::MapTrainerTeamMemberWrapper::items()
 {
-    QList<int> itemIds = m_teamMember->items();
+    QList<int> itemIds = m_teamMember->item();
     QList<ItemWrapper*> items;
     foreach (int id, itemIds)
         items.append(sigmod()->item(id));
@@ -68,7 +67,7 @@ QList<Sigscript::ItemWrapper*> Sigscript::MapTrainerTeamMemberWrapper::items()
 
 QList<Sigscript::MoveWrapper*> Sigscript::MapTrainerTeamMemberWrapper::moves()
 {
-    QList<int> moveIds = m_teamMember->moves();
+    QList<int> moveIds = m_teamMember->move();
     QList<MoveWrapper*> moves;
     foreach (int id, moveIds)
         moves.append(sigmod()->move(id));
@@ -77,7 +76,7 @@ QList<Sigscript::MoveWrapper*> Sigscript::MapTrainerTeamMemberWrapper::moves()
 
 QList<Sigscript::NatureWrapper*> Sigscript::MapTrainerTeamMemberWrapper::natures()
 {
-    QList<int> natureIds = m_teamMember->natures();
+    QList<int> natureIds = m_teamMember->nature();
     QList<NatureWrapper*> natures;
     foreach (int id, natureIds)
         natures.append(sigmod()->nature(id));