From f35904804b1a262a61832c6defd14708974f8768 Mon Sep 17 00:00:00 2001 From: "Matthew D. Steele" Date: Wed, 26 Jun 2024 10:20:41 -0400 Subject: [PATCH] Add music for mermaid florist --- nsf/nsf.cfg | 1 + src/music.asm | 2 ++ src/music.inc | 1 + src/music/florist.sng | 24 ++++++++++++++++++++++++ src/room.asm | 2 +- 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/music/florist.sng diff --git a/nsf/nsf.cfg b/nsf/nsf.cfg index c307e4c2..25937d46 100644 --- a/nsf/nsf.cfg +++ b/nsf/nsf.cfg @@ -45,6 +45,7 @@ SEGMENTS { PRGC_Core: load=PRG, type=ro; PRGC_Crypt: load=PRG, type=ro; PRGC_Garden: load=PRG, type=ro; + PRGC_Mermaid: load=PRG, type=ro; PRGC_Mine: load=PRG, type=ro; PRGC_Prison: load=PRG, type=ro; PRGC_Temple: load=PRG, type=ro; diff --git a/src/music.asm b/src/music.asm index 7c6d5871..17316b27 100644 --- a/src/music.asm +++ b/src/music.asm @@ -24,6 +24,7 @@ .IMPORT DataC_Core_Boss2_sMusic .IMPORT DataC_Crypt_Crypt_sMusic .IMPORT DataC_Garden_Garden_sMusic +.IMPORT DataC_Mermaid_Florist_sMusic .IMPORT DataC_Mine_MinePlaceholder_sMusic .IMPORT DataC_Prison_Prison_sMusic .IMPORT DataC_Temple_TemplePlaceholder_sMusic @@ -50,6 +51,7 @@ d_entry table, Calm, Data_Calm_sMusic d_entry table, Credits, DataC_Title_Credits_sMusic d_entry table, Crypt, DataC_Crypt_Crypt_sMusic + d_entry table, Florist, DataC_Mermaid_Florist_sMusic d_entry table, Garden, DataC_Garden_Garden_sMusic d_entry table, Mine, DataC_Mine_MinePlaceholder_sMusic d_entry table, Prison, DataC_Prison_Prison_sMusic diff --git a/src/music.inc b/src/music.inc index 8c78d99e..f0b3fdde 100644 --- a/src/music.inc +++ b/src/music.inc @@ -25,6 +25,7 @@ Calm Credits Crypt + Florist Garden Mine Prison diff --git a/src/music/florist.sng b/src/music/florist.sng new file mode 100644 index 00000000..a90a99a4 --- /dev/null +++ b/src/music/florist.sng @@ -0,0 +1,24 @@ +@PRGC_Mermaid + +!SONG Florist "|ABB" + +=tempo q36 +=key 3b % c minor + +!INST 1A Staccato $0a d1/8 +!INST TB Constant $ff % bass +!INST ND Staccato $07 % drum + +!PART A + +T| p(iB c3e r ' gv r ' c^ r ' gv r)TA :2 | +N| p(iD x4q ' x6s x6 x6e ' x4e x6s x6s+ ' +s x6s x6e)NA :2 | + +!PART B + +1| iA c4e gv ' d^ gv ' e^q ' ee ds cs | bNvq ' d^ ' ch | + | c4e gv ' d^ gv ' e^q ' de c | de gv ' d^s e fe ' eh | + | c4e gvs g ' d^e gvs g ' e^q ' de c | bNvq ' bNs c^ de ' ch | + | g4q ' fe e ' ds e fe ' eq | dq ' bNv ' c^e cv ' cq | +T| pTA :8 | +N| pNA :8 | diff --git a/src/room.asm b/src/room.asm index d62db2ff..8e5db257 100644 --- a/src/room.asm +++ b/src/room.asm @@ -578,7 +578,7 @@ _PrisonMusic: d_byte MermaidHut1, eMusic::Silence d_byte MermaidHut2, eMusic::Silence d_byte MermaidHut3, eMusic::Silence - d_byte MermaidHut4, eMusic::Silence + d_byte MermaidHut4, eMusic::Florist d_byte MermaidHut5, eMusic::Silence d_byte MermaidHut6, eMusic::Silence d_byte MermaidSpring, eMusic::Silence