Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-ex… · innocenthedgehog/eva-emerald@2b8e023