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

Fixed "this" dungeon items for glitched modes

Browse Source
This commit is contained in:
codemann8
2024-10-20 04:07:39 -05:00
parent 413d5cc5fd
commit 4e6f4255d9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Rom.py
View File

@@ -438,7 +438,7 @@ 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
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
@@ -453,7 +453,7 @@ def patch_rom(world, rom, player, team, is_mystery=False):
continue continue
elif location.type == LocationType.Bonk: elif location.type == LocationType.Bonk:
address = snes_to_pc(location.address) address = snes_to_pc(location.address)
rom.write_byte(address, handle_native_dungeon(location, itemid)) rom.write_byte(address, itemid)
if location.item.player != player: if location.item.player != player:
rom.write_byte(address+1, location.item.player) rom.write_byte(address+1, location.item.player)
else: else:
@@ -463,8 +463,6 @@ def patch_rom(world, rom, player, team, is_mystery=False):
continue continue
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

2
source/dungeon/EnemyList.py
View File

@@ -558,8 +558,6 @@ class Sprite(object):
if self.location is not None: if self.location is not None:
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:
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)