diff --git a/README.md b/README.md index 541d7bdb0..00a969bd4 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,7 @@ issue. You should always Hard Reset to avoid this issue entirely. * Trade quest items from skipped locations are no longer lost when another trade item is found. * Fix a crash when dungeon rewards are directly selected as starting items. * 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. #### New Speedups * The first text box from each carpenter in the Thieves' Hideout is skipped. diff --git a/State.py b/State.py index 52b17328b..59ef20972 100644 --- a/State.py +++ b/State.py @@ -180,7 +180,7 @@ def region_has_shortcuts(self, region_name: str) -> bool: def has_all_notes_for_song(self, song: str) -> bool: # Scarecrow needs 2 different notes if song == 'Scarecrow Song': - return self.has_ocarina_buttons(2) + return self.world.settings.free_scarecrow or self.has_ocarina_buttons(2) notes = str(self.world.song_notes[song]) if 'A' in notes: diff --git a/version.py b/version.py index f53693456..30542f464 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -__version__ = '8.2.46' +__version__ = '8.2.47' # This is a supplemental version number for branches based off of main dev. supplementary_version = 0