Compare commits
6 Commits
6474975b07
...
d2a5bb56d8
| Author | SHA1 | Date | |
|---|---|---|---|
| d2a5bb56d8 | |||
| e86312f145 | |||
| 97aceb3f43 | |||
| b6f73ffda4 | |||
| c4687a3be6 | |||
| 4d63168e9a |
@@ -3186,6 +3186,8 @@ class Spoiler(object):
|
||||
'code': {p: Settings.make_code(self.world, p) for p in range(1, self.world.players + 1)},
|
||||
'seed': self.world.seed
|
||||
}
|
||||
if self.hashes:
|
||||
self.metadata['hash'] = {p: self.hashes[p, 0] for p in range(1, self.world.players + 1)} # TODO: make this work for multiple teams
|
||||
|
||||
for p in range(1, self.world.players + 1):
|
||||
from ItemList import set_default_triforce
|
||||
|
||||
38
Rom.py
38
Rom.py
@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
|
||||
from Versions import DRVersion, GKVersion, ORVersion
|
||||
|
||||
JAP10HASH = '03a63945398191337e896e5771f77173'
|
||||
RANDOMIZERBASEHASH = '5fe97f04afd1880f281ec2c27cfabc17'
|
||||
RANDOMIZERBASEHASH = 'beae4c06c4841030709639215e2b03c3'
|
||||
|
||||
|
||||
class JsonRom(object):
|
||||
@@ -1503,19 +1503,6 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
|
||||
loot_source |= 0x04
|
||||
rom.write_byte(0x1CFF10, loot_source)
|
||||
|
||||
if world.showloot[player] == 'never':
|
||||
rom.write_bytes(0x1CFF08, [0x00, 0x00, 0x00, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x00)
|
||||
elif world.showloot[player] == 'presence':
|
||||
rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x00, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x00)
|
||||
elif world.showloot[player] == 'compass':
|
||||
rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x02, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x01)
|
||||
elif world.showloot[player] == 'always':
|
||||
rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x00)
|
||||
|
||||
if world.loothud[player] == 'never':
|
||||
rom.write_byte(0x1CFF12, 0x00)
|
||||
elif world.showloot[player] == 'presence':
|
||||
@@ -1528,6 +1515,20 @@ def patch_rom(world, rom, player, team, is_mystery=False, rom_header=None):
|
||||
rom.write_byte(0x1CFF12, 0x01)
|
||||
rom.write_bytes(0x1CFF0E, [0xFF, 0x01])
|
||||
|
||||
if world.showloot[player] == 'never':
|
||||
rom.write_bytes(0x1CFF08, [0x00, 0x00, 0x00, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x00)
|
||||
rom.write_byte(0x1CFF12, 0x00) # turn off hud icon too just to be safe
|
||||
elif world.showloot[player] == 'presence':
|
||||
rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x00, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x00)
|
||||
elif world.showloot[player] == 'compass':
|
||||
rom.write_bytes(0x1CFF08, [0x01, 0x00, 0x02, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x01)
|
||||
elif world.showloot[player] == 'always':
|
||||
rom.write_bytes(0x1CFF08, [0x02, 0x00, 0x00, 0x00])
|
||||
rom.write_byte(0x1CFF11, 0x00)
|
||||
|
||||
if world.showmap[player] == 'visited':
|
||||
rom.write_bytes(0x1CFF00, [0x01, 0x00, 0x00, 0x05])
|
||||
elif world.showmap[player] == 'map':
|
||||
@@ -3540,7 +3541,10 @@ Prizes = ['Green Pendant',
|
||||
]
|
||||
|
||||
hash_alphabet = [
|
||||
"Bow", "Boomerang", "Hookshot", "Bomb", "Mushroom", "Powder", "Rod", "Pendant", "Bombos", "Ether", "Quake",
|
||||
"Lamp", "Hammer", "Shovel", "Ocarina", "Bug Net", "Book", "Bottle", "Potion", "Cane", "Cape", "Mirror", "Boots",
|
||||
"Gloves", "Flippers", "Pearl", "Shield", "Tunic", "Heart", "Map", "Compass", "Key"
|
||||
"Bow", "Boomerang", "Hookshot", "Bomb", "Mushroom", "Powder",
|
||||
"Ice Rod", "Green Pendant", "Bombos", "Ether", "Quake", "Lamp",
|
||||
"Hammer", "Shovel", "Ocarina", "Bug Net", "Book", "Bottle",
|
||||
"Green Potion", "Somaria", "Cape", "Mirror", "Boots", "Gloves",
|
||||
"Flippers", "Pearl", "Shield", "Green Tunic", "Heart", "Map",
|
||||
"Compass", "Key",
|
||||
]
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user