Fix softlock with charging moves; fix double summon bug with Dragon Tail and similar moves in a trainer battle