Applied more Object IDs

Also replaced 'bra.w *+4's with branches to an actual label, and
replaced instances of v_objspace with v_player where appropriate
Merge branch 'master' into MapMacros