Disk IDs and treasure disk colour were not being correctly converted. This also adds several tests to ensure that these items are handled correctly. Closes #1934.