From 49cad9c3f8b0a31103bfa926c640b85b384d0067 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Fri, 31 Jul 2026 15:25:22 -0400
Subject: [PATCH 1/3] fix trimmed fanfare overlap bug

---
 patches/ips/trimmed_fanfare.ips | Bin 0 -> 126 bytes
 patches/rom_map/Bank 84.txt     |   2 +-
 patches/rom_map/RAM.txt         |   3 +-
 patches/src/trimmed_fanfare.asm |  61 ++++++++++++++++++++++++++++++++
 rust/maprando/src/patch.rs      |   4 ++-
 scripts/build_ips.py            |   4 +++
 6 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 patches/ips/trimmed_fanfare.ips
 create mode 100644 patches/src/trimmed_fanfare.asm

diff --git a/patches/ips/trimmed_fanfare.ips b/patches/ips/trimmed_fanfare.ips
new file mode 100644
index 0000000000000000000000000000000000000000..fcafdc271cfded613fc50cd49fe4f49848e25328
GIT binary patch
literal 126
zcmWG=3~}~gOjKiFk6G}g<<+ZKOgxMXEJ{1Rv@n${U<h45?`z%3|Nk$r#F#v6TFJnm
z^u50!M)zS;l*dUXh6@^Nzp{g9WsuCl{)P+?0n)M{gAt^1<^TWvKwbk6P#uT?maocY
OYMIEu^nt<E-wgn%GdTSK

literal 0
HcmV?d00001

diff --git a/patches/rom_map/Bank 84.txt b/patches/rom_map/Bank 84.txt
index c2b1a18c9c..d24d803adb 100644
--- a/patches/rom_map/Bank 84.txt	
+++ b/patches/rom_map/Bank 84.txt	
@@ -7,7 +7,7 @@ F300 - F30C: ; escape_items.asm
 F380 - F418: ; escape.asm
 F480 - F489: ; etank_refill_full.asm
 F490 - F499: ; reserve_hud.asm
-F4A0 - F4FF: [FREE]
+F4A0 - F4FF: ; trimmed_fanfare.asm
 F500 - F550: ; itemsounds.asm
 F580 - F58D: ; mb_left_entrance.asm
 F590 - F59D: ; horizontal_door_fix.asm
diff --git a/patches/rom_map/RAM.txt b/patches/rom_map/RAM.txt
index e6f1723ec2..97a1939d0e 100644
--- a/patches/rom_map/RAM.txt
+++ b/patches/rom_map/RAM.txt
@@ -48,7 +48,8 @@ $7EF596: vanilla_bugfixes.asm
 $7EF597-$7EF599: split_speed.asm
 $7EF59A-$7EF59C: reserve_backward_fill.asm
 $7EF59C-$7EF59E: crash_handle_xmode.asm
-$7EF59E-$7EFE00: [FREE]
+$7EF59E-$7EF5A0: trimmed_fanfare.asm
+$7EF5A0-$7EFE00: [FREE]
 $7EFE00: map area (copy of $1F5B to be saved to SRAM)
 $7EFE02: map area explored mask
 $7EFE04: copy of $1F5D (to be saved to SRAM for escape autosave)
diff --git a/patches/src/trimmed_fanfare.asm b/patches/src/trimmed_fanfare.asm
new file mode 100644
index 0000000000..fd2f9af871
--- /dev/null
+++ b/patches/src/trimmed_fanfare.asm
@@ -0,0 +1,61 @@
+; Fanfare fix by Stag Shot / nn44
+; 
+; Fixes potential fanfare overlap with trimmed setting in rooms with two items.
+
+lorom
+
+!bank_84_free_space_start = $84F4A0
+!bank_84_free_space_end = $84F500
+
+!ram_music_backup = $7EF59E
+
+org $82e126
+    jml check_music
+    nop #3
+    
+org $848c01
+    jsl clear_music
+
+org $858491
+    dw $00F0        ; 4s
+
+org $84f4a0
+check_music:
+    lda !ram_music_backup
+    cmp #$ffff      ; music backup active?
+    bne .normal_ret
+    jml $82e134     ; skip rest of func
+    
+.normal_ret
+    lda #$0000      ; replaced code
+    jsl $808ff7     ;
+    jml $82e12d
+    
+clear_music:
+    phy
+    pha             ; music track
+    cmp #$0002
+    bne .leave      ; fanfare?
+    lda $7f5        ; current music
+    cmp #$0002
+    bne .leave_2    ; in middle of previous fanfare?
+    lda #$0000
+    jsl $808fc1     ; stop music (8-frame delay)
+    pla
+    jsl $808fc1     ; fanfare (8-frame delay)
+    lda !ram_music_backup ; previous music
+    ldy #$0168      ; 6s
+    jsl $808ff7     ; music (delayed)
+    lda #$ffff      ; clear music track
+    sta !ram_music_backup
+    bra .leave_3
+
+.leave
+    lda $7f5
+.leave_2
+    sta !ram_music_backup ; save music track
+    pla             ; music track
+    jsl $808fc1     ; replaced code
+.leave_3
+    ply
+    rtl
diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index 22829d409d..bb24411979 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -711,7 +711,9 @@ impl Patcher<'_> {
             }
             Fanfares::Trimmed => {
                 // reduce fanfare dialogue box duration (240 frames)
-                self.rom.write_u16(snes2pc(0x858491), 0xF0)?;
+                patches.push("trimmed_fanfare");
+                patches.push("vanilla_fanfare_stop_sounds");
+
             }
             Fanfares::Off => {
                 patches.push("itemsounds");
diff --git a/scripts/build_ips.py b/scripts/build_ips.py
index a174ef9f45..6fb7c0da4a 100644
--- a/scripts/build_ips.py
+++ b/scripts/build_ips.py
@@ -162,6 +162,10 @@ def check_range(filename, other_filename, overlap_start, overlap_end):
         ['hud_expansion_opaque', 0xB6CE00, 0xB6D000],
         ['hud_expansion_opaque', 0xB6E800, 0xB6F000]
     ],
+    'trimmed_fanfare': [
+        ['itemsounds', 0x82E126, 0x82E12C],
+        ['itemsounds', 0x858491, 0x858493],
+    ],
 }
 
 failed = False

From fe9a8f8144b64f8afe03cf5ea40bcf51249f1da7 Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Fri, 31 Jul 2026 15:29:34 -0400
Subject: [PATCH 2/3] fix formatting

---
 rust/maprando/src/patch.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rust/maprando/src/patch.rs b/rust/maprando/src/patch.rs
index bb24411979..f09c75d2fa 100644
--- a/rust/maprando/src/patch.rs
+++ b/rust/maprando/src/patch.rs
@@ -713,7 +713,6 @@ impl Patcher<'_> {
                 // reduce fanfare dialogue box duration (240 frames)
                 patches.push("trimmed_fanfare");
                 patches.push("vanilla_fanfare_stop_sounds");
-
             }
             Fanfares::Off => {
                 patches.push("itemsounds");

From e4e1ea07000a7822fc06f9b7d9430743d7ca13fa Mon Sep 17 00:00:00 2001
From: jeboo <jeb00o@yahoo.com>
Date: Fri, 31 Jul 2026 17:15:55 -0400
Subject: [PATCH 3/3] use bank limits

---
 patches/src/trimmed_fanfare.asm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/patches/src/trimmed_fanfare.asm b/patches/src/trimmed_fanfare.asm
index fd2f9af871..f025f0975f 100644
--- a/patches/src/trimmed_fanfare.asm
+++ b/patches/src/trimmed_fanfare.asm
@@ -19,7 +19,7 @@ org $848c01
 org $858491
     dw $00F0        ; 4s
 
-org $84f4a0
+org !bank_84_free_space_start
 check_music:
     lda !ram_music_backup
     cmp #$ffff      ; music backup active?
@@ -59,3 +59,5 @@ clear_music:
 .leave_3
     ply
     rtl
+
+assert pc() <= !bank_84_free_space_end