Bugfix/us 9687 some fixes

Leikt Sol'Reihin requested to merge leikt.solreihin/pokemonsdk:bugfix/us-9687_some_fixes into development Jun 03, 2021