From 811630a5dd82c571836c03131b00ff2608ea5d25 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Wed, 13 Nov 2013 23:07:26 -0600 Subject: a better in-battle check for text_wait --- pokemontools/vba/battle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pokemontools/vba/battle.py b/pokemontools/vba/battle.py index 1b582dd..7c788b9 100644 --- a/pokemontools/vba/battle.py +++ b/pokemontools/vba/battle.py @@ -262,7 +262,7 @@ class Battle(EmulatorController): """ # callback causes text_wait to exit when the callback returns True def is_in_battle_checker(): - return (self.emulator.vba.read_memory_at(0xd22d) == 0) + return (self.emulator.vba.read_memory_at(0xd22d) == 0) and (self.emulator.vba.read_memory_at(0xc734) != 0) while not self.is_input_required() and self.is_in_battle(): self.emulator.text_wait(callback=is_in_battle_checker) -- cgit v1.2.3