Mostly fixes and trainers

Added in 4 trainers and fixes to them and other pokemon. Also gave pidgey his new model.