summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 16:46:11 -0400
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 16:46:11 -0400
commitdd0e53a144fec114833cbf13d9358927c6b11e8d (patch)
treec7fbf9bb00bc57a28ff7c17144376a9d2fb1ee15
parent7f2ddee417145d4b89359feae78cbdb2e0074556 (diff)
Match se_kouka_l.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_kouka_l.midbin0 -> 103 bytes
-rw-r--r--sound/songs/se_kouka_l.s56
4 files changed, 4 insertions, 57 deletions
diff --git a/ld_script.txt b/ld_script.txt
index a1385aff2..4461d2535 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -576,7 +576,7 @@ SECTIONS {
sound/songs/midi/se_kaidan.o(.rodata);
sound/songs/midi/se_dansa.o(.rodata);
sound/songs/midi/se_jitensya.o(.rodata);
- sound/songs/se_kouka_l.o(.rodata);
+ sound/songs/midi/se_kouka_l.o(.rodata);
sound/songs/se_kouka_m.o(.rodata);
sound/songs/midi/se_kouka_h.o(.rodata);
sound/songs/midi/se_bowa2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e44359c91..5b20250be 100644
--- a/songs.mk
+++ b/songs.mk
@@ -945,5 +945,8 @@ $(MID_SUBDIR)/se_kon4.s: %.s: %.mid
$(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+$(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_kouka_l.mid b/sound/songs/midi/se_kouka_l.mid
new file mode 100644
index 000000000..34aafbb18
--- /dev/null
+++ b/sound/songs/midi/se_kouka_l.mid
Binary files differ
diff --git a/sound/songs/se_kouka_l.s b/sound/songs/se_kouka_l.s
deleted file mode 100644
index f00241b69..000000000
--- a/sound/songs/se_kouka_l.s
+++ /dev/null
@@ -1,56 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_kouka_l_grp, voicegroup127
- .equ se_kouka_l_pri, 5
- .equ se_kouka_l_rev, reverb_set+50
- .equ se_kouka_l_mvl, 127
- .equ se_kouka_l_key, 0
- .equ se_kouka_l_tbs, 1
- .equ se_kouka_l_exg, 0
- .equ se_kouka_l_cmp, 1
-
- .section .rodata
- .global se_kouka_l
- .align 2
-
-@********************** Track 1 **********************@
-
-se_kouka_l_1:
- .byte KEYSH , se_kouka_l_key+0
- .byte TEMPO , 90*se_kouka_l_tbs/2
- .byte VOICE , 127
- .byte VOL , 110*se_kouka_l_mvl/mxv
- .byte N03 , Gn2 , v100
- .byte W03
- .byte N06 , As2
- .byte W03
- .byte W03
- .byte FINE
-
-@********************** Track 2 **********************@
-
-se_kouka_l_2:
- .byte KEYSH , se_kouka_l_key+0
- .byte VOICE , 0
- .byte VOL , 110*se_kouka_l_mvl/mxv
- .byte N09 , As1 , v127
- .byte W03
- .byte W03
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_kouka_l:
- .byte 2 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_kouka_l_pri @ Priority
- .byte se_kouka_l_rev @ Reverb.
-
- .word se_kouka_l_grp
-
- .word se_kouka_l_1
- .word se_kouka_l_2
-
- .end