cleaned up the game

Cleaned up parts of the game to run smoother like the magic shoppe and
the end game function will actually end the game