Merge pull request #3722 from Sonicadvance1/upgrade_to_new_MaJoR1 Update to MaJoR1's latest on screen buttons
