This requires a slightly slower text_wait function. There is probably a way to refactor that function in a way that doesn't cause cancer.
Use the givepoke function to add a few more pokemon to the team before starting the battle-related tests. There are some features of the battle handling code that require more than one pokemon to be present in the party.