Merge pull request #1417 from turbedi/FixKeldeoStuff

Fix Keldeo in Teambuilder/Battle
po-devs · Dec 1, 2015 · f1f7c8d · f1f7c8d
2 parents 59adeb8 + 4130b36
commit f1f7c8d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/src/Teambuilder/Teambuilder/pokeedit.cpp b/src/Teambuilder/Teambuilder/pokeedit.cpp
@@ -417,8 +417,7 @@ void PokeEdit::setNum(Pokemon::uniqueId num)
                     poke().setMove(Move::SecretSword, 0, false);
                 }
             } else if (PokemonInfo::Released(Pokemon::Keldeo_R, poke().gen())) {
-                if (poke().gen() < 6)
-                    poke().removeMove(Move::SecretSword);
+                poke().removeMove(Move::SecretSword);
             }
         } else if (num.pokenum == Pokemon::Giratina) {
             if (num == Pokemon::Giratina_O && poke().item() != Item::GriseousOrb) {

diff --git a/src/libraries/PokemonInfo/battlestructs.cpp b/src/libraries/PokemonInfo/battlestructs.cpp
@@ -174,8 +174,7 @@ void PokeBattle::init(PokePersonal &poke)
         }
 
         if (num() == Pokemon::Keldeo_R && !poke.hasMove(Move::SecretSword)) {
-            if (p.gen() < 6)
-                num() = Pokemon::Keldeo;
+            num() = Pokemon::Keldeo;
         }
 
         Pokemon::uniqueId ori = PokemonInfo::OriginalForme(num());

diff --git a/src/libraries/PokemonInfo/pokemonstructs.cpp b/src/libraries/PokemonInfo/pokemonstructs.cpp
@@ -315,16 +315,6 @@ void PokePersonal::runCheck(bool hack)
 
         MoveSetChecker::isValid(num(), gen(), move(0), move(1), move(2), move(3), ability(), gender(), level(), false, &invalidMoves);
     }
-
-    if (num().pokenum == Pokemon::Keldeo) {
-        if (gen() < 6) {
-            if (move(0) == Move::SecretSword || move(1) == Move::SecretSword || move(2) == Move::SecretSword || move(3) == Move::SecretSword) {
-                num() = Pokemon::Keldeo_R;
-            } else {
-                num() = num().original();
-            }
-        }
-    }
 }
 
 int PokePersonal::addMove(int moveNum, bool check) throw(QString)