From 30deb1d5bc46484a160bba63461cf4bcd52b0a33 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 12 Mar 2023 19:25:35 -0500 Subject: [PATCH] Fix for Bonk Locations in Multiworld --- MultiClient.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/MultiClient.py b/MultiClient.py index fd0e8b4f..5b8ebd30 100644 --- a/MultiClient.py +++ b/MultiClient.py @@ -144,6 +144,7 @@ location_table_uw = {"Blind's Hideout - Top": (0x11d, 0x10), 'Mini Moldorm Cave - Far Right': (0x123, 0x80), 'Mini Moldorm Cave - Generous Guy': (0x123, 0x400), 'Ice Rod Cave': (0x120, 0x10), + 'Cold Fairy Statue': (0x120, 0x200), 'Bonk Rock Cave': (0x124, 0x10), 'Desert Palace - Big Chest': (0x73, 0x10), 'Desert Palace - Torch': (0x73, 0x400), @@ -936,10 +937,11 @@ async def track_locations(ctx : Context, roomid, roomdata): from OWEdges import OWTileRegions for location, (_, flag, _, _, region_name, _) in bonk_prize_table.items(): if location not in ctx.locations_checked: - screenid = OWTileRegions[region_name] - ow_unchecked[location] = (screenid, flag) - ow_begin = min(ow_begin, screenid) - ow_end = max(ow_end, screenid + 1) + if region_name in OWTileRegions: + screenid = OWTileRegions[region_name] + ow_unchecked[location] = (screenid, flag) + ow_begin = min(ow_begin, screenid) + ow_end = max(ow_end, screenid + 1) if ow_begin < ow_end: ow_data = await snes_read(ctx, SAVEDATA_START + 0x280 + ow_begin, ow_end - ow_begin) if ow_data is not None: