6th Gen move fixes + ORAS stuff

Flags and such.