pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

make vba emulator wait until text is done drawing

Browse Source 
Also, this fixes some bugs related to how button presses are handled.
This commit is contained in:
Bryan Bishop 2013-06-16 11:34:30 -05:00
parent d9779c5852
commit 6c5ccae807
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
extras/vba.py
View File

@ -159,15 +159,21 @@ def button_combiner(buttons):
# recognized as "s" and "t" etc.. # recognized as "s" and "t" etc..
if isinstance(buttons, str): if isinstance(buttons, str):
if "restart" in buttons: if "restart" in buttons:
buttons.replace("restart", "") buttons = buttons.replace("restart", "")
result |= button_masks["restart"] result |= button_masks["restart"]
if "start" in buttons: if "start" in buttons:
buttons.replace("start", "") buttons = buttons.replace("start", "")
result |= button_masks["start"] result |= button_masks["start"]
if "select" in buttons: if "select" in buttons:
buttons.replace("select", "") buttons = buttons.replace("select", "")
result |= button_masks["select"] result |= button_masks["select"]
# allow for the "a, b" and "a b" formats
if ", " in buttons:
buttons = buttons.split(", ")
elif " " in buttons:
buttons = buttons.split(" ")
if isinstance(buttons, list): if isinstance(buttons, list):
if len(buttons) > 9: if len(buttons) > 9:
raise Exception("can't combine more than 9 buttons at a time") raise Exception("can't combine more than 9 buttons at a time")
@ -429,7 +435,7 @@ def set_memory_at(address, value):
""" """
Gb.setMemoryAt(address, value) Gb.setMemoryAt(address, value)
def press(buttons, steplimit=1): def press(buttons, holdsteps=1, aftersteps=1):
""" """
Press a button. Use steplimit to say for how many steps you want to press Press a button. Use steplimit to say for how many steps you want to press
the button (try leaving it at the default, 1). the button (try leaving it at the default, 1).
@ -440,9 +446,14 @@ def press(buttons, steplimit=1):
number = buttons number = buttons
else: else:
number = buttons number = buttons
for step_counter in range(0, steplimit): for step_counter in range(0, holdsteps):
Gb.step(number) Gb.step(number)
# clear the button press
if aftersteps > 0:
for step_counter in range(0, aftersteps):
Gb.step(0)
def get_buttons(): def get_buttons():
""" """
Returns the currentButtons[0] value (an integer with bits set for which Returns the currentButtons[0] value (an integer with bits set for which
@ -701,6 +712,26 @@ class crystal:
Just a simple namespace to store a bunch of functions for Pokémon Crystal. Just a simple namespace to store a bunch of functions for Pokémon Crystal.
""" """
@staticmethod
def text_wait(step_size=10, max_wait=500):
"""
Watches for a sign that text is done being drawn to screen, then
presses the "A" button.
:param step_size: number of steps per wait loop
:param max_wait: number of wait loops to perform
"""
for x in range(0, max_wait):
hi = get_memory_at(registers.sp + 1)
lo = get_memory_at(registers.sp)
address = ((hi << 8) | lo)
if address == 0xaef:
break
else:
nstep(step_size)
press("a", holdsteps=50, aftersteps=1)
@staticmethod @staticmethod
def walk_through_walls_slow(): def walk_through_walls_slow():
memory = get_memory() memory = get_memory()