6th Gen move fixes + ORAS stuff

Flags and such.
Merge pull request #1254 from Fuzzysqurl/oras

6th Gen move fixes + ORAS stuff