Merge remote-tracking branch 'origin/main'

This commit is contained in:
Fabian Dill 2021-01-30 09:57:33 +01:00
commit 520dd7ba91
3 changed files with 2 additions and 2 deletions

View File

@ -233,4 +233,4 @@ item_name_groups['Everything'] = {name for name, data in item_table.items() if t
item_name_groups['Progression Items'] = progression_items
item_name_groups['Non Progression Items'] = item_name_groups['Everything'] - progression_items
trap_replaceable = item_name_groups['Rupees'] | {'Arrows (10)', 'Single Bomb', 'Bombs (3)', 'Bombs (10)'}
trap_replaceable = item_name_groups['Rupees'] | {'Arrows (10)', 'Single Bomb', 'Bombs (3)', 'Bombs (10)', 'Nothing'}

2
Rom.py
View File

@ -1,7 +1,7 @@
from __future__ import annotations
JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '7d9778b7c0a90d71fa5f32a3b56cdd87'
RANDOMIZERBASEHASH = '417f926edfb0f83cdaf74019a26c53e8'
import io
import json

Binary file not shown.