Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't and some other things discovered along the way

Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't and some other things discovered along the way #8286