Skip to content

Commit

Permalink
Merge branch 'new_flags' into dev-fenhl
Browse files Browse the repository at this point in the history
  • Loading branch information
@fenhl
fenhl committed Nov 26, 2023
2 parents 8e6e832 + 0b1f71c commit 8901876
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions LocationList.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1379,13 +1379,6 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
("Fire Temple MQ Iron Knuckle Room Pot 8", ("Pot", 0x04, (18,0,11), None, 'Fairy Drop', ("Fire Temple MQ", "Master Quest", "Pots",))),
("Fire Temple MQ Boss Key Chest Room Pot 1", ("Pot", 0x04, (19,0,15), None, 'Rupees (5)', ("Fire Temple MQ", "Master Quest", "Pots",))),
("Fire Temple MQ Boss Key Chest Room Pot 2", ("Pot", 0x04, (19,0,14), None, 'Fairy Drop', ("Fire Temple MQ", "Master Quest", "Pots",))),
("Fire Temple MQ Upper Lizalfos Maze Small Wooden Crate 1", ("Pot", 0x04, (5,0,33), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Upper Lizalfos Maze Small Wooden Crate 2", ("Pot", 0x04, (5,0,34), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 1", ("Pot", 0x04, (16,0,14), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 2", ("Pot", 0x04, (16,0,15), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 3", ("Pot", 0x04, (16,0,16), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 4", ("Pot", 0x04, (16,0,17), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 5", ("Pot", 0x04, (16,0,18), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
# Fire Temple MQ Crates
("Fire Temple MQ Near Boss Left Crate 1", ("Crate", 0x04, (2,0,14), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Near Boss Left Crate 2", ("Crate", 0x04, (2,0,15), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
Expand All @@ -1405,11 +1398,18 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
("Fire Temple MQ Upper Lizalfos Maze Crate 1", ("Crate", 0x04, (5,0,25), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Upper Lizalfos Maze Crate 2", ("Crate", 0x04, (5,0,26), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Upper Lizalfos Maze Crate 3", ("Crate", 0x04, (5,0,27), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Upper Lizalfos Maze Small Wooden Crate 1", ("SmallCrate", 0x04, (5,0,33), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Upper Lizalfos Maze Small Wooden Crate 2", ("SmallCrate", 0x04, (5,0,34), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Right Crate 1", ("Crate", 0x04, (16,0,11), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Right Crate 2", ("Crate", 0x04, (16,0,13), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Center Crate", ("Crate", 0x04, (16,0,10), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Left Crate 1", ("Crate", 0x04, (16,0,12), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Left Crate 2", ("Crate", 0x04, (16,0,9), None, 'Rupee (1)', ("Fire Temple MQ", "Master Quest", "Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 1", ("SmallCrate", 0x04, (16,0,14), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 2", ("SmallCrate", 0x04, (16,0,15), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 3", ("SmallCrate", 0x04, (16,0,16), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 4", ("SmallCrate", 0x04, (16,0,17), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),
("Fire Temple MQ Shoot Torch On Wall Room Small Wooden Crate 5", ("SmallCrate", 0x04, (16,0,18), None, 'Nothing', ("Fire Temple MQ", "Master Quest", "Small Crates",))),

# Fire Temple Shared
("Fire Temple Volvagia Heart", ("BossHeart", 0x15, 0x4F, None, 'Heart Container', ("Fire Temple", "Fire Temple MQ", "Vanilla Dungeons", "Master Quest",))),
Expand Down
2 changes: 1 addition & 1 deletion version.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__version__ = '8.0.2'

# This is a supplemental version number for branches based off of main dev.
supplementary_version = 6
supplementary_version = 7

# Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
# This will be 0x00 for main releases and 0x01 for main dev.
Expand Down

0 comments on commit 8901876

Please sign in to comment.