Fixed errors caused by the previous commit

There was no room type for a normal room. Also, there were other
problems due to using room strings to generate the types. Why did I do
this? (Original code written 2 years ago)