Checkin updated water room (Also added combo room logic, so you probably can't beat the game anymore...)