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

Only start at Big Bomb Shop if not ER

Browse Source
This commit is contained in:
codemann8
2022-01-15 18:00:33 -06:00
parent 5dc8f59f73
commit 593ce8086a
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Rom.py
View File

@@ -812,7 +812,7 @@ def patch_rom(world, rom, player, team, enemized, is_mystery=False):
if should_be_bunny(sanc_region, world.mode[player]): if should_be_bunny(sanc_region, world.mode[player]):
rom.write_bytes(0x13fff2, [0x12, 0x00]) rom.write_bytes(0x13fff2, [0x12, 0x00])
if not world.is_tile_swapped(0x2c, player): if not world.is_bombshop_start(player):
lh_name = 'Links House' lh_name = 'Links House'
else: else:
lh_name = 'Big Bomb Shop' lh_name = 'Big Bomb Shop'
@@ -2207,13 +2207,9 @@ def write_strings(rom, world, player, team):
elif world.shopsanity[player]: elif world.shopsanity[player]:
entrances_to_hint.update(ShopEntrances) entrances_to_hint.update(ShopEntrances)
if world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull']: if world.shuffle[player] not in ['vanilla', 'dungeonssimple', 'dungeonsfull']:
if world.is_tile_swapped(0x2c, player): if not world.is_bombshop_start(player):
entrances_to_hint.update({'Links House': 'The hero\'s old residence'})
if world.shufflelinks[player]:
entrances_to_hint.update({'Big Bomb Shop': 'The old bomb shop'}) entrances_to_hint.update({'Big Bomb Shop': 'The old bomb shop'})
else: else:
entrances_to_hint.update({'Big Bomb Shop': 'The old bomb shop'})
if world.shufflelinks[player]:
entrances_to_hint.update({'Links House': 'The hero\'s old residence'}) entrances_to_hint.update({'Links House': 'The hero\'s old residence'})
entrances_to_hint.update({'Dark Sanctuary Hint': 'The dark sanctuary cave'}) entrances_to_hint.update({'Dark Sanctuary Hint': 'The dark sanctuary cave'})
if world.shuffle[player] in ['insanity', 'madness_legacy', 'insanity_legacy']: if world.shuffle[player] in ['insanity', 'madness_legacy', 'insanity_legacy']:
@@ -2649,6 +2645,7 @@ def set_inverted_mode(world, player, rom, inverted_buffer):
if world.is_tile_swapped(0x29, player): if world.is_tile_swapped(0x29, player):
rom.write_bytes(snes_to_pc(0x06B2AB), [0xF0, 0xE1, 0x05]) # frog pickup on contact rom.write_bytes(snes_to_pc(0x06B2AB), [0xF0, 0xE1, 0x05]) # frog pickup on contact
if world.is_tile_swapped(0x2c, player): if world.is_tile_swapped(0x2c, player):
if world.is_bombshop_start(player):
rom.write_bytes(snes_to_pc(0x03F484), [0xFD, 0x4B, 0x68]) # place bed in bomb shop rom.write_bytes(snes_to_pc(0x03F484), [0xFD, 0x4B, 0x68]) # place bed in bomb shop
# spawn in bomb shop # spawn in bomb shop