Flaaffy and Tentacruel
Merge pull request #744 from LightAdept/master

Flaaffy and Tentacruel (with cool animation)