diff --git a/Main.py b/Main.py index 9bb9dc67..d00ed5ad 100644 --- a/Main.py +++ b/Main.py @@ -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 -__version__ = '1.0.1.3-v' +__version__ = '1.0.1.4-v' from source.classes.BabelFish import BabelFish diff --git a/MultiClient.py b/MultiClient.py index bc496f5b..4504fed7 100644 --- a/MultiClient.py +++ b/MultiClient.py @@ -90,8 +90,8 @@ INGAME_MODES = {0x07, 0x09, 0x0b} SAVEDATA_START = WRAM_START + 0xF000 SAVEDATA_SIZE = 0x500 -POT_ITEMS_SRAM_START = WRAM_START + 0x016018 -SPRITE_ITEMS_SRAM_START = WRAM_START + 0x016268 +POT_ITEMS_SRAM_START = WRAM_START + 0x016600 +SPRITE_ITEMS_SRAM_START = WRAM_START + 0x016850 ITEM_SRAM_SIZE = 0x250 RECV_PROGRESS_ADDR = SAVEDATA_START + 0x4D0 # 2 bytes diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ce764cf5..43f3786a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -144,6 +144,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o #### Volatile +* 1.0.1.4 + * Reverted SRAM change (the underlying refactor isn't done yet) * 1.0.1.3 * Fixed inverted generation issues with pottery option * Moved SRAM according to SRAM standard diff --git a/Regions.py b/Regions.py index 1b5401c7..b1226401 100644 --- a/Regions.py +++ b/Regions.py @@ -1077,7 +1077,7 @@ def create_pot_location(pot, pot_index, super_tile, world, player): 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]) diff --git a/Rom.py b/Rom.py index 2e7c33d6..c8a2f1c1 100644 --- a/Rom.py +++ b/Rom.py @@ -35,7 +35,7 @@ from source.item.FillUtil import valid_pot_items JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = 'a25e589ca9359e73b0ed94cab8db107d' +RANDOMIZERBASEHASH = '749534eb511d0cfeb7c7b5a81803d4bb' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index 5e4a4941..52ccfd77 100644 Binary files a/data/base2current.bps and b/data/base2current.bps differ