ACCESS: Only save river scene fields when actually in the river scene

I'm still not happy everything needed is being synchronised, so this
way we can work on it further without upsetting other Amazon saves