Leahnaya/pokemon-reverse-engineering-tools
1
0
Fork 0
mirror of https://github.com/pret/pokemon-reverse-engineering-tools.git synced 2026-09-14 05:05:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

a better in-battle check for text_wait

Browse Source
This commit is contained in:
Bryan Bishop
2013-11-13 23:07:26 -06:00
parent 367485303a
commit 811630a5dd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pokemontools/vba/battle.py
View File

@@ -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)