Fix misc TR1/2 issues

Part of #841. #### Checklist - [x] I have read the [coding conventions](https://github.com/LostArtefacts/TR-Rando/blob/master/CONTRIBUTING.md#coding-conventions) - [x] I have read the [testing guidelines](https://github.com/LostArtefacts/TR-Rando/blob/master/CONTRIBUTING.md#testing-guidelines) - [x] I have added a changelog entry about what my pull request accomplishes, or it is an internal change #### Description Wraps up the remaining issues in #841, although I'll leave that open for now as a tracker for testing. This is all unreleased, apart from the OG Xian fix, but didn't feel it was worth its own PR. A bit of a mixed bag, but hopefully the commits are self-explanatory.