bunch of bugfixes including ones that popped up when adding new features

marielle's maid outfit caused her to just run when entering minecarts (because her sprite was changed back to whats based on her outfit)