whirlwind + fly fix

Allows Whirlwind to hit Fly in Gen 2/6