morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multishop-all' into multishop

Browse Source
This commit is contained in:
CaitSith2
2021-01-10 05:38:54 -08:00
parent a4bb67d90a 4250004f11
commit a8475c38b2
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MultiClient.py
View File

@@ -1154,7 +1154,7 @@ async def track_locations(ctx : Context, roomid, roomdata):
if roomid in location_shop_ids:
misc_data = await snes_read(ctx, SHOP_ADDR, len(location_shop_order)*3)
for cnt, b in enumerate(misc_data):
my_check = Regions.shop_table_by_location_id[0x400000 + cnt]
my_check = Regions.shop_table_by_location_id[Regions.SHOP_ID_START + cnt]
if int(b) > 0 and my_check not in ctx.locations_checked:
new_check(my_check)
except Exception as e: