Some snazzy fixes in Pokemon.cpp, main, and Makefile.