From 0cf691dc7c0337e3c52244051daaa81ae26d93c0 Mon Sep 17 00:00:00 2001
From: Colin Bartolome <cbartolo@crappycomic.com>
Date: Mon, 18 Nov 2024 18:49:05 -0800
Subject: [PATCH] Change the Etecoons' song to SMB1. Closes #593

---
 alttp_sm_combo_randomizer_rom/src/main.asm    |   1 +
 .../src/sm/etecoons_smb1.asm                  |  33 ++++++++++++++++++
 .../FileData/IpsPatches/zsm.ips               | Bin 1454163 -> 1454251 bytes
 3 files changed, 34 insertions(+)
 create mode 100644 alttp_sm_combo_randomizer_rom/src/sm/etecoons_smb1.asm

diff --git a/alttp_sm_combo_randomizer_rom/src/main.asm b/alttp_sm_combo_randomizer_rom/src/main.asm
index a20987f8c..4f2b8e7ec 100644
--- a/alttp_sm_combo_randomizer_rom/src/main.asm
+++ b/alttp_sm_combo_randomizer_rom/src/main.asm
@@ -38,6 +38,7 @@ incsrc "sm/messagebox.asm"                  ; Super Metroid Messagebox improveme
 incsrc "sm/spc.asm"                         ; Super Metroid MSU-1 SPC patches
 incsrc "sm/msu.asm"                         ; Super Metroid MSU-1 patches (also inits MSU-1 tracklist)
 incsrc "sm/counthyperbeam.asm"              ; Super Metroid Helper for counting Hyper Beam shots
+incsrc "sm/etecoons_smb1.asm"               ; Super Metroid change Etecoons' song to Super Mario Bros 1.
 
 ; --- ALTTP code ---
 incsrc "z3/hirom.asm"	                    ; ALTTP ExHiROM patch
diff --git a/alttp_sm_combo_randomizer_rom/src/sm/etecoons_smb1.asm b/alttp_sm_combo_randomizer_rom/src/sm/etecoons_smb1.asm
new file mode 100644
index 000000000..fe0f1c15e
--- /dev/null
+++ b/alttp_sm_combo_randomizer_rom/src/sm/etecoons_smb1.asm
@@ -0,0 +1,33 @@
+; Patches the song the Etecoons sing to be the intro for World 1-1 in Super Mario Bros. 1
+; This sound effect is Library 2, Sound 0x35
+
+; From spc.asm: engine starts at $CF8108 vanilla ROM, but $CF0108 in SMZ3
+
+org $CFA510-$8000   ; Overwrite the setup call
+    dw $39A8        ; Two voices, high-priority
+
+org $CFABA7-$8000   ; Overwrite the instruction list
+    dw $3FA3        ; Melody instruction list
+    dw $3FC7        ; Bassline instruction list
+
+; Melody ($24 bytes)
+
+    db $1D,$80,$0A,$AD,$0B
+    db $1D,$80,$0A,$AD,$18
+    db $1D,$80,$0A,$AD,$18
+    db $1D,$80,$0A,$A9,$0B
+    db $1D,$80,$0A,$AD,$1B
+    db $1D,$80,$0A,$B0,$30
+    db $1D,$80,$0A,$A4,$30
+    db $FF
+
+; Bassline ($24 bytes)
+
+    db $1D,$70,$0A,$9F,$0B
+    db $1D,$70,$0A,$9F,$18
+    db $1D,$70,$0A,$9F,$18
+    db $1D,$70,$0A,$9F,$0B
+    db $1D,$70,$0A,$9F,$18
+    db $1D,$70,$0A,$A4,$30
+    db $1D,$70,$0A,$98,$30
+    db $FF
diff --git a/src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips b/src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips
index d248bbb8f0a12cbd53c7c1f9135dce5a09d9568c..505023ee52f949a6abe726e239b19cc82ede7e2b 100644
GIT binary patch
delta 185
zcmccoAY%2yh=whU^P|F51sIrCSn_KxXYg5Uf81WSfom-{h>(C0E5Tf8Aa{cSkXT~y
zU$%g2J~xPvfD>@;5(A*v41@pe^P(7mm<foPftUq|S%H`hh}nUd1Bf|+m<x!xftUw~
dd4ZS@i1~q70Eh*FSO|!PfmmewyeQGFR{{4+LFE7d

delta 97
zcmWN=yA6OK6hP6Sq9Xp$-N>89&M_RomV`l!Jx)REJ;}L0|0I6|b;+4Uv0%xHnl&4?
VH0)^EbKuB{GZ(IO++vnJygw(uFLnR`