Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the Etecoons' song to SMB1. Closes #593 #605

Merged
merged 1 commit into from
Nov 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions alttp_sm_combo_randomizer_rom/src/main.asm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions alttp_sm_combo_randomizer_rom/src/sm/etecoons_smb1.asm
Original file line number Diff line number Diff line change
@@ -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
Binary file modified src/TrackerCouncil.Smz3.SeedGenerator/FileData/IpsPatches/zsm.ips
Binary file not shown.