Pokemon Emerald: Fix shoal cave flag wrong byte, delay bounce to end …

…of map transition
ArchipelagoMW · Oct 2, 2024 · 4d39e1d · 4d39e1d
1 parent d0133b6
commit 4d39e1d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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([{