Few more fixes in Pokemon.cpp.