Simplified Room Management

Made one var to keep track of room location. Changed so instead of
adding to change integer for room just changed integer itself.