GameStates are now in an enum

Removed Defines too. We'll probably want that back later...