refactored secret room placement a little bit for #255 and #244