From 61dab410e3bc6ef2568c486284c4ba3fa17b63fc Mon Sep 17 00:00:00 2001 From: pekempy Date: Wed, 14 Feb 2024 22:37:43 +0000 Subject: [PATCH] Fix daycare on Fire Red (#248) --- modules/modes/daycare.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/modes/daycare.py b/modules/modes/daycare.py index 81a604970..11a68f013 100644 --- a/modules/modes/daycare.py +++ b/modules/modes/daycare.py @@ -218,9 +218,12 @@ def pc_release(): context.emulator.press_button("Down") yield from wait_for_n_frames(20) else: - context.emulator.press_button("A") - yield from wait_for_n_frames(7) + while not task_is_active("Task_OnSelectedMon"): + context.emulator.press_button("A") + yield + yield from wait_until_task_is_active("Task_OnSelectedMon") for _ in range(2): + yield from wait_for_n_frames(10) context.emulator.press_button("Up") yield from wait_for_n_frames(2) context.emulator.press_button("A")