summaryrefslogtreecommitdiff
path: root/pokemontools/vba
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-11-11 21:52:12 -0600
committerBryan Bishop <kanzure@gmail.com>2013-11-11 21:52:12 -0600
commitcc4c24816767caaaf1a6c2d280184505565eb688 (patch)
tree3634d0d52cd9feed1e26baaf4969ba8fc64fbf0b /pokemontools/vba
parentba6eb203b4afef6179d30a13f6f4037349d79272 (diff)
add is_switch_prompt to the input poll detector
Diffstat (limited to 'pokemontools/vba')
-rw-r--r--pokemontools/vba/battle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pokemontools/vba/battle.py b/pokemontools/vba/battle.py
index a5d9d52..a453478 100644
--- a/pokemontools/vba/battle.py
+++ b/pokemontools/vba/battle.py
@@ -38,7 +38,7 @@ class Battle(EmulatorController):
"""
Detects if the battle is waiting for player input.
"""
- return self.is_player_turn() or self.is_mandatory_switch()
+ return self.is_player_turn() or self.is_mandatory_switch() or self.is_switch_prompt()
def is_fight_pack_run_menu(self):
"""