[Deja Vu]

Seeing as it takes like- what, 100 battles for sentimentality to set in? I wouldn't be against it being at battle start, over battle finish.

But I can also understand why it would be reset by battle end, a draw back to using two weapons. But there's already a few of those. Momentum cost, having to build for two things, less item slots. I'd prefer it being at battle start, personally. One less headache.

EDIT: Weapon swap lock based on sentimentality would be just CBT.