Merge pull request #551 from Slayer95/master

Fix Gen 1 and 2 being unplayable