Fix protean + yawn
Merge pull request #1273 from Fuzzysqurl/bugs

Fix protean + yawn
Sprite Fixes
Merge pull request #1274 from Fuzzysqurl/bugs

Sprite Fixes
New Item Icons + Fix Vivillon Icons
Merge pull request #1275 from Fuzzysqurl/bugs

New Item Icons + Fix Vivillon Icons
Infestation is Special
Merge pull request #1276 from Fuzzysqurl/bugs

Infestation is Special
Aromatherapy + Sap Sipper + Clean up bad code
Merge pull request #1277 from Fuzzysqurl/bugs

Aromatherapy + Sap Sipper + Clean up bad code
Placeholder sprites
Merge pull request #1278 from Fuzzysqurl/master

Placeholder sprites
Strong sun should prevent frozen
Merge pull request #1279 from Fuzzysqurl/master

Strong sun should prevent frozen
Fix Strong Weather on death
Merge pull request #1280 from Fuzzysqurl/master

Fix Strong Weather on death
Fix Parting Shot + Magic Bounce + Mega Evolving
Merge pull request #1281 from Fuzzysqurl/master

Fix Parting Shot + Magic Bounce + Mega Evolving
Fix Charge
Merge pull request #1282 from Fuzzysqurl/master

Fix Charge