Fix 'next move' handling so flail's charging punch works

Also fixes katana's backwards wall kick/spin, but thorn's spike charge
still works, too.