https://git.magicalgirl.moe/STJr/SRB2/merge_requests/476#note_11225
This fixes the former of the two issues that I mentioned.