Merge pull request #377 from CovenEsme/fix-groose-sound-again

Fix turning off trap sounds on loadzone
mint-choc-chip-skyblade · Jun 15, 2024 · 61a5b0c · 61a5b0c
2 parents 7e246e8 + ec2e753
commit 61a5b0c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/asm/additions/diffs/rust-additions-diff.yaml b/asm/additions/diffs/rust-additions-diff.yaml
@@ -2556,7 +2556,7 @@
   0x28, 0x81, 0x08, 0xAA, 0x00, 0x01, 0x3F, 0xD6, 0x74, 0x5A, 0xEA, 0xD0, 0xC0, 0x00,
   0x00, 0x35, 0x88, 0xA6, 0x64, 0x39, 0x1F, 0x05, 0x00, 0x71, 0x60, 0x00, 0x00, 0x54,
   0xE0, 0x03, 0x1F, 0x2A, 0x02, 0x00, 0x00, 0x14, 0x15, 0x00, 0x00, 0x94, 0x88, 0x5A,
-  0xEA, 0xF0, 0x80, 0xA6, 0x24, 0x39, 0xE1, 0x03, 0x1F, 0x2A, 0x08, 0x11, 0x46, 0xF9,
+  0xEA, 0xF0, 0x80, 0xA6, 0x24, 0x39, 0xE1, 0xFF, 0x9F, 0x52, 0x08, 0x11, 0x46, 0xF9,
   0xE0, 0x03, 0x08, 0xAA, 0xFD, 0x05, 0x00, 0x94, 0x68, 0x9A, 0x44, 0xF9, 0xE9, 0x1F,
   0x80, 0x52, 0xF4, 0x4F, 0x47, 0xA9, 0xF6, 0x57, 0x46, 0xA9, 0x09, 0xB1, 0x0E, 0x39,
   0xF8, 0x5F, 0x45, 0xA9, 0x1F, 0xB5, 0x0E, 0x39, 0xFA, 0x67, 0x44, 0xA9, 0x1F, 0xBD,

diff --git a/asm/additions/rust-additions/src/entrance.rs b/asm/additions/rust-additions/src/entrance.rs
@@ -179,7 +179,7 @@ pub fn handle_er_cases() {
             NEXT_NIGHT = 0;
         }
 
-        playFanfareMaybe(FANFARE_SOUND_MGR, 0);
+        playFanfareMaybe(FANFARE_SOUND_MGR, 0xFFFF);
 
         // Replaced code sets these
         (*GAME_RELOADER_PTR).item_to_use_after_reload = 0xFF;