Changes since tag r9

commit 782dbe429c4bb6a2087bdfc7f6383779168b5f09
Author: MysticalOS <mysticalosx@gmail.com>
Date:   Mon Jun 3 20:36:39 2019 -0400

    Push some of the dungeon bugfixes from classic branch to this one

