[Mordred]

Thanks for the tip. Most of the changes going from 17-18 have been pretty easy so far since aracnoz's stuff is almost always wrapped in #ifdef HAS_DS_PLAYER, and then it's just a matter of making sure that code still belongs where it belongs, and updating the variable names, and accessor functions his code uses.

I'm gonna see how far off I am at the end of this merge stuff (only 72 files left!) and see how difficult it looks to get things in working-ish order. Will probably abandon for you and jogal's work, but it's been an interesting process so far. Even if it's wasted effort it finally gave me a reason to install the Linux subsystem on Windows too so that I can do git things from a terminal that I needed to do, so that's a plus.