I feel that Battle music should cut on when you enter active mode instead of when you engage an enemy, and go back to area music when you return to passive mode.

Thoughts?