Build updates
Asm and C++ conversion complete
Combined Rock & Cool defs