Merge branch 'Dev' into dev-fenhl

fenhl · fenhl · commit 9d3090c093d0 · 2025-08-17T14:26:15.000Z
# Conflicts:
#	ASM/build/bundle.o
#	data/generated/rom_patch.txt
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/c/item_effects.c b/ASM/c/item_effects.c
@@ -243,7 +243,7 @@ void open_gate_and_mask_shop(z64_file_t* save, int16_t arg1, int16_t arg2) {
                     // Set the openingState so it starts to open
                     BgGateShutter* gate = (BgGateShutter*)curr;
                     gate->openingState = 2;
-                    return;
+                    break;
                 }
                 curr = curr->next;
             }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * The Deku Shield pot in the Spirit Temple is no longer shuffled when both `Fix Broken Drops` and `Include Empty Pots` are off.
 * For consistency with other location types, excluded pot/crate/beehive/wonderitem/etc. locations no longer behave as if their shuffle setting was off.
 * The Triforce Piece counter display has been moved to a CRT-safe position.
+* Fix Complete Mask Quest not working if Zelda's Letter is found in Kakariko.
 
 ## Other changes
 * Big poe souls can now be collected while riding Epona.
diff --git a/Patches.py b/Patches.py
@@ -569,6 +569,7 @@ def make_bytes(txt: str, size: int) -> list[int]:
         world.settings.shuffle_song_items not in ('vanilla', 'song')
         or world.distribution.songs_as_items
         or any(name in song_list and record.count for name, record in world.settings.starting_items.items())
+        or any(name in song_list and count for name, count in world.randomized_starting_items.items())
         or world.settings.shuffle_individual_ocarina_notes
     )
     if songs_as_items:
diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.3.28'
+__version__ = '8.3.30'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 1

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ void open_gate_and_mask_shop(z64_file_t* save, int16_t arg1, int16_t arg2) {`
`243`	`243`	`// Set the openingState so it starts to open`
`244`	`244`	`BgGateShutter* gate = (BgGateShutter*)curr;`
`245`	`245`	`gate->openingState = 2;`
`246`		`- return;`
	`246`	`+ break;`
`247`	`247`	`}`
`248`	`248`	`curr = curr->next;`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -569,6 +569,7 @@ def make_bytes(txt: str, size: int) -> list[int]:`
`569`	`569`	`world.settings.shuffle_song_items not in ('vanilla', 'song')`
`570`	`570`	`or world.distribution.songs_as_items`
`571`	`571`	`or any(name in song_list and record.count for name, record in world.settings.starting_items.items())`
	`572`	`+ or any(name in song_list and count for name, count in world.randomized_starting_items.items())`
`572`	`573`	`or world.settings.shuffle_individual_ocarina_notes`
`573`	`574`	`)`
`574`	`575`	`if songs_as_items:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '8.3.28'`
	`1`	`+__version__ = '8.3.30'`
`2`	`2`
`3`	`3`	`# This is a supplemental version number for branches based off of main dev.`
`4`	`4`	`supplementary_version = 1`