Use dimension constants in warp data and add map name consisntency

The diff for main.asm that github won't show:
http://pastebin.com/FqSD9GyN