Merged in DR v1.4.1.8

This commit is contained in:
codemann8
2024-03-20 18:09:08 -05:00
6 changed files with 43 additions and 7 deletions

View File

@@ -166,14 +166,14 @@ def boss_writes(world, player, rom):
data_tables.room_headers[room_id].byte_0 = 0x60
data_tables.room_headers[room_id].effect = 4
# $2E, $98, $FF (original shell)
# disable trinexx ice breath with No-ops if there's a trinexx anywhere outside TR
rom.write_bytes(snes_to_pc(0x09B37E), [0xEA, 0xEA, 0xEA, 0xEA])
if boss.name == 'Kholdstare' and (dungeon.name != 'Ice Palace' or level is not None):
add_shell_to_boss_room(data_tables, dungeon.name, level, 0xF95)
data_tables.room_headers[room_id].byte_0 = 0xE0
data_tables.room_headers[room_id].effect = 1
if boss.name != 'Trinexx' and dungeon.name == 'Turtle Rock' and level is None:
remove_shell_from_boss_room(data_tables, dungeon.name, level, 0xFF2)
# disable trinexx ice breath with No-ops
rom.write_bytes(snes_to_pc(0x09B37E), [0xEA, 0xEA, 0xEA, 0xEA])
if boss.name != 'Kholdstare' and dungeon.name == 'Ice Palace' and level is None:
remove_shell_from_boss_room(data_tables, dungeon.name, level, 0xF95)
if boss.name != 'Blind' and dungeon.name == 'Thieves Town' and level is None:

View File

@@ -160,6 +160,7 @@ UwGeneralDeny:
- [ 0x0058, 8, ["Statue"]]
- [ 0x0059, 0, [ "RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ] #"Skull Woods - Bridge Room - Mini Moldorm 1"
- [ 0x0059, 1, [ "RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ] #"Skull Woods - Bridge Room - Mini Moldorm 2"
- [0x0059, 5, ["RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper"]]
- [ 0x0059, 9, [ "RollerVerticalUp", "RollerVerticalDown", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ] #"Skull Woods - Bridge Room - Gibdo 1"
- [ 0x005e, 3, [ "RollerHorizontalLeft", "RollerHorizontalRight", "Beamos", "AntiFairyCircle", "SpikeBlock", "Bumper" ] ] #"Ice Palace - Pit Trap - Big Spike Trap"
- [ 0x005e, 4, [ "RollerVerticalUp", "RollerVerticalDown" ] ] #"Ice Palace - Pit Trap - Fire Bar (Clockwise)"