Merge branch 'master' of https://github.com/sverx/sms-gbdk-compat into sverx-improvements