switch tests to use new battle starter

tests/bootstrapping.py

@@ -49,7 +49,6 @@ def bootstrap_trainer_battle():
     cry.givepoke(224, 60, "OcTiLlErY")
     cry.givepoke(126, 87, "magmar")
 
-    # TODO: figure out a better way to start a trainer battle :(
-    runner.cry.start_trainer_battle_lamely()
+    cry.start_trainer_battle()
 
     return runner.cry.vba.state

tests/test_vba_battle.py

@@ -40,6 +40,7 @@ class BattleTests(unittest.TestCase):
         # reset to whatever the bootstrapper created
         self.vba.state = self.bootstrap_state
         self.battle = Battle(emulator=self.cry)
+        self.battle.skip_start_text()
 
     def test_is_in_battle(self):
         self.assertTrue(self.battle.is_in_battle())