summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 16:15:30 -0400
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-10-10 16:15:30 -0400
commit27f2b3b00ab6cda07d6a5033ae21e44fde15e78b (patch)
tree599d601cb235fe4a2ba2ec894f9eabb82e3372aa
parentab5c24daa6a5190f9caf470ea6043c0a35c92ce6 (diff)
Match se_i.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/songs/midi/se_i.midbin0 -> 75 bytes
-rw-r--r--sound/songs/se_i.s45
4 files changed, 4 insertions, 46 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 8346c6ce9..7722ba540 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -590,7 +590,7 @@ SECTIONS {
sound/songs/midi/se_bowa.o(.rodata);
sound/songs/se_jyuni.o(.rodata);
sound/songs/midi/se_a.o(.rodata);
- sound/songs/se_i.o(.rodata);
+ sound/songs/midi/se_i.o(.rodata);
sound/songs/se_u.o(.rodata);
sound/songs/midi/se_e.o(.rodata);
sound/songs/se_o.o(.rodata);
diff --git a/songs.mk b/songs.mk
index ecd18722f..c7bea07de 100644
--- a/songs.mk
+++ b/songs.mk
@@ -903,5 +903,8 @@ $(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid
$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3
+$(MID_SUBDIR)/se_i.s: %.s: %.mid
+ $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
+
$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_i.mid b/sound/songs/midi/se_i.mid
new file mode 100644
index 000000000..df7278dfd
--- /dev/null
+++ b/sound/songs/midi/se_i.mid
Binary files differ
diff --git a/sound/songs/se_i.s b/sound/songs/se_i.s
deleted file mode 100644
index fdb4ff5c4..000000000
--- a/sound/songs/se_i.s
+++ /dev/null
@@ -1,45 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_i_grp, voicegroup128
- .equ se_i_pri, 4
- .equ se_i_rev, reverb_set+50
- .equ se_i_mvl, 127
- .equ se_i_key, 0
- .equ se_i_tbs, 1
- .equ se_i_exg, 0
- .equ se_i_cmp, 1
-
- .section .rodata
- .global se_i
- .align 2
-
-@********************** Track 1 **********************@
-
-se_i_1:
- .byte KEYSH , se_i_key+0
- .byte TEMPO , 240*se_i_tbs/2
- .byte VOICE , 123
- .byte BENDR , 12
- .byte VOL , 120*se_i_mvl/mxv
- .byte BEND , c_v+0
- .byte N72 , Cn3 , v127
- .byte W24
- .byte W24
- .byte W24
- .byte W24
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_i:
- .byte 1 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_i_pri @ Priority
- .byte se_i_rev @ Reverb.
-
- .word se_i_grp
-
- .word se_i_1
-
- .end