Private Room refactor - Distinguish hidden and secret rooms

Deleting this block obviously doesn't belong in this pull request...