From 4d39e1d9515121d57ca90946c69d0c7e19bc9a02 Mon Sep 17 00:00:00 2001 From: Zunawe Date: Tue, 1 Oct 2024 18:20:35 -0700 Subject: [PATCH] Pokemon Emerald: Fix shoal cave flag wrong byte, delay bounce to end of map transition --- worlds/pokemon_emerald/client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/worlds/pokemon_emerald/client.py b/worlds/pokemon_emerald/client.py index 2d80c081f3e0..5add7b3fca40 100644 --- a/worlds/pokemon_emerald/client.py +++ b/worlds/pokemon_emerald/client.py @@ -423,13 +423,13 @@ async def handle_tracker_info(self, ctx: "BizHawkClientContext", guards: Dict[st (sb1_address + 0x4, 2, "System Bus"), # Current map (sb1_address + 0x1450 + (data.constants["FLAG_SYS_SHOAL_TIDE"] // 8), 1, "System Bus"), ], - [guards["SAVE BLOCK 1"]] + [guards["IN OVERWORLD"], guards["SAVE BLOCK 1"]] ) if read_result is None: # Save block moved return current_map = int.from_bytes(read_result[0], "big") - shoal_cave = int(read_result[0][0] & (1 << (data.constants["FLAG_SYS_SHOAL_TIDE"] % 8)) > 0) + shoal_cave = int(read_result[1][0] & (1 << (data.constants["FLAG_SYS_SHOAL_TIDE"] % 8)) > 0) if current_map != self.current_map: self.current_map = current_map await ctx.send_msgs([{