Carracosta and magmar.
Merge pull request #1011 from LightAdept/master

Carracosta and magmar