Fix color enums more
Fairy and Popcorn were flipped in the dehacked list and the color enums. This makes them consistent with the rest of the lists' order.
Fairy and Popcorn were flipped in the dehacked list and the color enums. This makes them consistent with the rest of the lists' order.
merged