alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Restore native dungeon item behavior for glitched modes. baserom handles dungeon IDs

Browse Source
This commit is contained in:
Kris Davie
2025-01-12 22:20:54 +01:00
committed by aerinon
parent 6268a7e503
commit 5664526e0c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Rom.py
View File

@@ -434,7 +434,9 @@ def patch_rom(world, rom, player, team, is_mystery=False):
if location.item.name in valid_pot_items and location.item.player == player: if location.item.name in valid_pot_items and location.item.player == player:
location.pot.item = valid_pot_items[location.item.name] location.pot.item = valid_pot_items[location.item.name]
else: else:
code = handle_native_dungeon(location, itemid) code = itemid
if world.pottery[player] == 'none' or location.locked:
code = handle_native_dungeon(location, itemid)
standing_item_flag = 0x80 standing_item_flag = 0x80
if location.item.player != player: if location.item.player != player:
standing_item_flag |= 0x40 standing_item_flag |= 0x40
@@ -452,8 +454,6 @@ def patch_rom(world, rom, player, team, is_mystery=False):
if not location.crystal: if not location.crystal:
if location.item is not None: if location.item is not None:
# Keys in their native dungeon should use the original item code for keys
itemid = handle_native_dungeon(location, itemid)
if world.remote_items[player]: if world.remote_items[player]:
itemid = list(location_table.keys()).index(location.name) + 1 itemid = list(location_table.keys()).index(location.name) + 1
assert itemid < 0x100 assert itemid < 0x100

4
source/dungeon/EnemyList.py
View File

@@ -557,7 +557,9 @@ class Sprite(object):
item_id = self.location.item.code if self.location.item is not None else 0x5A item_id = self.location.item.code if self.location.item is not None else 0x5A
code = 0xF9 if self.location.item.player != self.location.player else 0xF8 code = 0xF9 if self.location.item.player != self.location.player else 0xF8
if code == 0xF8: if code == 0xF8:
item_id = handle_native_dungeon(self.location, item_id) world = self.location.parent_region.world
if world.dropshuffle[self.location.player] == 'none' or self.location.locked:
item_id = handle_native_dungeon(self.location, item_id)
data.append(item_id) data.append(item_id)
data.append(0 if code == 0xF8 else self.location.item.player) data.append(0 if code == 0xF8 else self.location.item.player)
data.append(code) data.append(code)