Merge in diegoisawesome's and mwksoul's changes to Master

TODO: Redo for Fire Red support. Add makefile flags so that we can seamlessly compile for both.