diff options
| -rw-r--r-- | pokemontools/vba/battle.py | 15 | ||||
| -rw-r--r-- | pokemontools/vba/vba.py | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/pokemontools/vba/battle.py b/pokemontools/vba/battle.py index 9fe4a84..6b52bce 100644 --- a/pokemontools/vba/battle.py +++ b/pokemontools/vba/battle.py @@ -64,6 +64,21 @@ class Battle(EmulatorController): """ return self.emulator.is_trainer_switch_prompt() + def is_wild_switch_prompt(self): + """ + Detects if the battle is waiting for the player to choose whether or + not to continue to fight the wild pokemon. + """ + return self.emulator.is_wild_switch_prompt() + + def is_switch_prompt(self): + """ + Detects both trainer and wild switch prompts (for prompting whether to + switch pokemon). This is a yes/no box and not the actual pokemon + selection menu. + """ + return self.is_trainer_switch_prompt() or self.is_wild_switch_prompt() + def is_mandatory_switch(self): """ Detects if the battle is waiting for the player to choose a next diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py index 67d3cf1..6f863b6 100644 --- a/pokemontools/vba/vba.py +++ b/pokemontools/vba/vba.py @@ -620,6 +620,21 @@ class crystal(object): return all([requirement in text for requirement in requirements]) + def is_wild_switch_prompt(self): + """ + Detects if the battle is waiting for the player to choose whether or + not to continue to fight the wild pokemon. + """ + # TODO: make a better implementation + return False + + def is_switch_prompt(self): + """ + Detects both the trainer-style switch prompt and the wild-style switch + prompt. This is the yes/no prompt for whether to switch pokemon. + """ + return self.is_trainer_switch_prompt() or self.is_wild_switch_prompt() + def unlock_flypoints(self): """ Unlocks different destinations for flying. |