Merge 'Fix Hideout Wonderitem flags' (OoTRandomizer#2254)

fenhl · Jul 1, 2024 · 90a889f · 90a889f
2 parents 4e00862 + e722111
commit 90a889f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/LocationList.py b/LocationList.py
@@ -943,8 +943,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
  ("Hideout 3 Torch Jail Wonderitem 2", ("Wonderitem", 0x0C, (1,0,5), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
  ("Hideout 1 Torch Jail Wonderitem 1", ("Wonderitem", 0x0C, (2,0,3), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
  ("Hideout 1 Torch Jail Wonderitem 2", ("Wonderitem", 0x0C, (2,0,4), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
- ("Hideout Kitchen Stove Wonderitem", ("Wonderitem", 0x0C, (3,0,4), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
- ("Hideout Kitchen Wonderitem", ("Wonderitem", 0x0C, (3,0,5), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
+ ("Hideout Kitchen Stove Wonderitem", ("Wonderitem", 0x0C, (3,0,5), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
+ ("Hideout Kitchen Wonderitem", ("Wonderitem", 0x0C, (3,0,4), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
  ("Hideout 4 Torch Jail Wonderitem 1", ("Wonderitem", 0x0C, (4,0,3), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
  ("Hideout 4 Torch Jail Wonderitem 2", ("Wonderitem", 0x0C, (4,0,4), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),
  ("Hideout 2 Torch Jail Wonderitem 1", ("Wonderitem", 0x0C, (5,0,3), None, 'Rupees (5)', ("Thieves' Hideout", "Wonderitem"))),

diff --git a/README.md b/README.md
@@ -140,6 +140,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * The softlock which occurs when collecting a shuffled silver rupee on the ladder in the Bottom of the Well is now fixed by moving the item location so it can't be collected from the ladder instead of disallowing silver rupees on this location.
 * Fix inverted cursor in the pause menu when pausing while in first person with the `Uninvert Y-Axis in First Person Camera` cosmetic setting enabled.
 * Fix some inconsistent tags for wonderitem locations in the `Exclude Locations` list.
+* Fix swapped `Hideout Kitchen Wonderitem` and `Hideout Kitchen Stove Wonderitem` locations.
 
 #### New Speedups
 * Meg will now take less time before respawning after getting hurt.

diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.1.49'
+__version__ = '8.1.50'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0