Divergent Paths: The 3 Scenarios

I'm having a little trouble with one of the events in this patch... but I'm using it as a base so it might be a problem not present in your original work.

The problem is in Locke's scenario, with the secret passage.  Winding the clock unlocks it, but any screen load resets the room (for instance, leaving or opening the menu).  But the clock cannot be wound again; this creates a potential soft-lock... particularly bad if the player has saved in the basement beforehand.

Have you encountered this problem?  If not, do you know the ROM location of the event that moves the bookcase?

--
EDIT: I learned how to use ZoneDoctor to find hex addresses!
Found the spot in question, it was near CA/5EB3 and CA/7935.  My patch had different values than yours did, and when I transferred the latter into the former it fixed the problem.
Not sure how I mussed up those spots, since I haven't done any event editing and I've been nowhere near the CA block.  Anyway, I guess it was my bug, not yours.  Sorry to have bugged you!

I really like your scenario changes, by the way.  High quality work.