Begone, Spiky Pichu

Can't be transferred to gen 6
Merge pull request #1296 from WriggleNightbug/patch-1

Begone, Spiky Pichu