Re-position save point in town

Fixes #1602 and also locks the door we don't use.