Fixed some battle bug

When battling the system was not noticing when a trainer has more pkmn
to send. Now this is fixed. need to change Anna's code so that she uses
the same function as Amaya