Skip to content

Commit

Permalink
remove key shop and useless keys from fourkeys
Browse files Browse the repository at this point in the history
  • Loading branch information
Anonymous committed Apr 23, 2023
1 parent d22ffbf commit 4c0b1f5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
8 changes: 7 additions & 1 deletion randomizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -6398,7 +6398,7 @@ def make_four_keys():
}

for location, master_index in sorted(master_keys.items()):
master_key = ItemNameObject.get(master_index)
master_key = ItemObject.get(master_index)
name_text = 'ALL {0}'.format(location).upper()
master_key.set_name(name_text)

Expand All @@ -6413,6 +6413,7 @@ def make_four_keys():
assert 1 <= opcode <= 6 or opcode == 0x40
key_index = script.script[0][2][0]
key = ItemObject.get(key_index)
key.set_name('Useless key')
locations = [loc for loc in keydict if key in keydict[loc]]
if not locations:
continue
Expand All @@ -6427,6 +6428,11 @@ def make_four_keys():
}
patch_with_template('master_key_door', parameters)

patch_text = ('!npc 0f (00) 9a:fe,fe\n'
'EVENT 9A-C-5E\n'
'0000. 00()\n')
patch_game_script(patch_text)


def make_open_world(custom=None):
# new coin shop on forfeit island (only supports coins + 3 items)
Expand Down
4 changes: 2 additions & 2 deletions tables/template_open_world_events.txt
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,8 @@ EVENT 80-C-5E
1060. 08: Okay.
No way.<CHOICE>
1070. 08: Great! Just hold
on to this for
me. Bye!<END MESSAGE>
on to this item
for me. Bye!<END MESSAGE>
1080. 1C(@3000)
2000. 08: Suit yourself. <END EVENT>
3000. A3({{starting_character_index}}-85)
Expand Down

0 comments on commit 4c0b1f5

Please sign in to comment.