Noibat CC, Wonder Room msg
Enigma Berry, Metro/Assist cant call SpikyShield
Toxic + Magicguard/Correct compounding of damage
HM Validation
Merge pull request #1022 from Fuzzysqurl/caterpiev2

HMs, Enigma, Toxic, Msg, Noibat CC (Redo #1019)