summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 15:09:29 -0500
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 15:09:29 -0500
commit59d691a5eed028301dedd73ee13baca43b8bd7ce (patch)
tree6ca23e0609137cf462ccf231a28e044e0187ab7d
parent3cfee40c8282556b9fa11ad8d85dd9f954e1d04c (diff)
Match se_n.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_n.midbin0 -> 75 bytes
-rw-r--r--sound/songs/se_n.s45
4 files changed, 4 insertions, 46 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 05fe9d5ab..469eb8fad 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -645,7 +645,7 @@ SECTIONS {
sound/songs/se_u.o(.rodata);
sound/songs/midi/se_e.o(.rodata);
sound/songs/se_o.o(.rodata);
- sound/songs/se_n.o(.rodata);
+ sound/songs/midi/se_n.o(.rodata);
sound/songs/se_seikai.o(.rodata);
sound/songs/midi/se_hazure.o(.rodata);
sound/songs/midi/se_exp.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7ecf87dbb..916af1571 100644
--- a/songs.mk
+++ b/songs.mk
@@ -960,5 +960,8 @@ $(MID_SUBDIR)/se_moter.s: %.s: %.mid
$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+$(MID_SUBDIR)/se_n.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_n.mid b/sound/songs/midi/se_n.mid
new file mode 100644
index 000000000..282bdf216
--- /dev/null
+++ b/sound/songs/midi/se_n.mid
Binary files differ
diff --git a/sound/songs/se_n.s b/sound/songs/se_n.s
deleted file mode 100644
index dc1938b05..000000000
--- a/sound/songs/se_n.s
+++ /dev/null
@@ -1,45 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_n_grp, voicegroup128
- .equ se_n_pri, 4
- .equ se_n_rev, reverb_set+50
- .equ se_n_mvl, 127
- .equ se_n_key, 0
- .equ se_n_tbs, 1
- .equ se_n_exg, 0
- .equ se_n_cmp, 1
-
- .section .rodata
- .global se_n
- .align 2
-
-@********************** Track 1 **********************@
-
-se_n_1:
- .byte KEYSH , se_n_key+0
- .byte TEMPO , 240*se_n_tbs/2
- .byte VOICE , 127
- .byte BENDR , 12
- .byte VOL , 127*se_n_mvl/mxv
- .byte BEND , c_v+0
- .byte N72 , Cn3 , v127
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_n:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_n_pri @ Priority
- .byte se_n_rev @ Reverb.
-
- .word se_n_grp
-
- .word se_n_1
-
- .end