Expanded music and sfx macros

They now include branches and byte sized move operands. Unfortunately,
they aren't as simple as they used to be, as you can't ignore the
arguments anymore.
Merge branch 'master' into AS