Applying OST constants to dead final boss code.
Merge remote-tracking branch 'origin/master' into MapMacros