diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-11-13 23:07:44 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-11-13 23:07:44 -0600 |
| commit | d8ab944d4354546d44d098b2c30ba82b6ff509ee (patch) | |
| tree | 5705c71c93c203604cacdaed6edf2eca5dffde17 /pokemontools/vba/vba.py | |
| parent | 811630a5dd82c571836c03131b00ff2608ea5d25 (diff) | |
simplify the date/clock check in text_wait
Diffstat (limited to 'pokemontools/vba/vba.py')
| -rw-r--r-- | pokemontools/vba/vba.py | 3 |
1 files changed, 1 insertions, 2 deletions
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 |