Revert SRAM changes

This commit is contained in:
aerinon
2022-02-10 08:36:30 -07:00
parent 49accbd2b1
commit 600343683a
6 changed files with 7 additions and 5 deletions

View File

@@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names
from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config
__version__ = '1.0.1.3-v' __version__ = '1.0.1.4-v'
from source.classes.BabelFish import BabelFish from source.classes.BabelFish import BabelFish

View File

@@ -90,8 +90,8 @@ INGAME_MODES = {0x07, 0x09, 0x0b}
SAVEDATA_START = WRAM_START + 0xF000 SAVEDATA_START = WRAM_START + 0xF000
SAVEDATA_SIZE = 0x500 SAVEDATA_SIZE = 0x500
POT_ITEMS_SRAM_START = WRAM_START + 0x016018 POT_ITEMS_SRAM_START = WRAM_START + 0x016600
SPRITE_ITEMS_SRAM_START = WRAM_START + 0x016268 SPRITE_ITEMS_SRAM_START = WRAM_START + 0x016850
ITEM_SRAM_SIZE = 0x250 ITEM_SRAM_SIZE = 0x250
RECV_PROGRESS_ADDR = SAVEDATA_START + 0x4D0 # 2 bytes RECV_PROGRESS_ADDR = SAVEDATA_START + 0x4D0 # 2 bytes

View File

@@ -144,6 +144,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o
#### Volatile #### Volatile
* 1.0.1.4
* Reverted SRAM change (the underlying refactor isn't done yet)
* 1.0.1.3 * 1.0.1.3
* Fixed inverted generation issues with pottery option * Fixed inverted generation issues with pottery option
* Moved SRAM according to SRAM standard * Moved SRAM according to SRAM standard

View File

@@ -1077,7 +1077,7 @@ def create_pot_location(pot, pot_index, super_tile, world, player):
def pot_address(pot_index, super_tile): def pot_address(pot_index, super_tile):
return 0x7f6018 + super_tile * 2 + (pot_index << 24) return 0x7f6600 + super_tile * 2 + (pot_index << 24)
# (type, room_id, shopkeeper, custom, locked, [items]) # (type, room_id, shopkeeper, custom, locked, [items])

2
Rom.py
View File

@@ -35,7 +35,7 @@ from source.item.FillUtil import valid_pot_items
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = 'a25e589ca9359e73b0ed94cab8db107d' RANDOMIZERBASEHASH = '749534eb511d0cfeb7c7b5a81803d4bb'
class JsonRom(object): class JsonRom(object):

Binary file not shown.