Fixed a ton of glitches. I kept 'Crossing Blades' as our battle music, but Jacques, your update sort of screwed everything up D:
