Fixed error in Basculin blue-strip form
added some missing locations
pulling in updates
Merge branch 'master' of git://git.veekun.com/pokedex