From d8ab944d4354546d44d098b2c30ba82b6ff509ee Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Wed, 13 Nov 2013 23:07:44 -0600 Subject: simplify the date/clock check in text_wait --- pokemontools/vba/vba.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pokemontools/vba/vba.py') diff --git a/pokemontools/vba/vba.py b/pokemontools/vba/vba.py index 5106004..c7a0bf9 100644 --- a/pokemontools/vba/vba.py +++ b/pokemontools/vba/vba.py @@ -462,8 +462,7 @@ class crystal(object): # date/time box (day choice) # 0x47ab is the one from the intro, 0x49ab is the one from mom. elif 0x47ab in stack or 0x49ab in stack: # was any([x in stack for x in range(0x46EE, 0x47AB)]) - # if not in battle - if self.vba.read_memory_at(0xd22d) == 0: + if not self.is_in_battle(): print "probably at a date/time box ? exiting." break -- cgit v1.2.3