More out of defines.h, fix do_cmd_locate coordinates