Sync up with latest from Deathmax

Sync up primarily for sphere type data (JP)