Fix bug where wrong music plays when save state is loaded on world map...

This is a fix for #174.

It should already be ready to merge into release-2.0, but I want to double check it, since it's been over a week since I tested it.  I just find it easier to create the request now while looking at it more.

Yes, I know - I haver write access and could directly push.  This will probably drag out a while longer given school if I do it that way this time.