Skip to content

Commit

Permalink
Merge branch 'Dev' into dev-fenhl
Browse files Browse the repository at this point in the history
fenhl committed Jan 28, 2025
1 parent 94680a4 commit 33700e2
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion HintList.py
Original file line number Diff line number Diff line change
@@ -1819,7 +1819,7 @@ def rainbow_bridge_hint_kind(world: World) -> str:
'Graveyard Dampe Race Rewards': ['Graveyard Dampe Race Hookshot Chest', 'Graveyard Dampe Race Freestanding PoH'],
'Graveyard Royal Family Tomb Contents': ['Graveyard Royal Familys Tomb Chest', 'Song from Royal Familys Tomb'],
'DMC Child Upper Checks': ['DMC GS Crate', 'DMC Deku Scrub'],
'Haunted Wasteland Checks': ['Wasteland Chest', 'Wasteland GS'],
'Haunted Wasteland Checks': ['Wasteland GS', 'Wasteland Chest'],
'Castle Fairy Checks': ['HC Great Fairy Reward', 'OGC Great Fairy Reward'],
'King Zora Items': ['ZD King Zora Thawed', 'ZD Trade Prescription'],

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -221,6 +221,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
* Fix an error with pre-completed dungeon rewards in multiworld.
* Scarecrow's song is now in logic without ocarina buttons if `Free Scarecrow's Song` is on.
* Fix a crash that could occur when doing certain sequences of actions in the treasure box shop with shuffled keys.
* Fix the items in the “Haunted Wasteland Checks” Dual hint being listed reverse.

#### New Speedups
* The first text box from each carpenter in the Thieves' Hideout is skipped.
4 changes: 2 additions & 2 deletions version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__version__ = '8.2.50'
__version__ = '8.2.51'

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

# 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.

0 comments on commit 33700e2

Please sign in to comment.