I'm currently working on updating the battle system into a much more usable system.
It includes separate handling of similar type of moves for instance, moves that may put the enemy to sleep will all be handled in the same way and so will moves that take two turns to perform.
It's currently in a semi-workable status, with Pokémon able to faint, however I haven't added in the checks to make the battle end or not.