Change defines for use with new angle adjust