moved #defines to .h file
Merge branch 'master' of https://github.com/philadelphiagamelab/Sonic