diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:21:21 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:21:21 -0500 |
| commit | 8a26e51269b37f62b96324b38ef6e6e8c9cde609 (patch) | |
| tree | 373eb34e02f899db53d4df3cc75c4a7f52f36103 | |
| parent | 964c943feef487c1ae2e3362a9e20c2599b107fe (diff) | |
Match se_o.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_o.mid | bin | 0 -> 75 bytes | |||
| -rw-r--r-- | sound/songs/se_o.s | 45 |
4 files changed, 4 insertions, 46 deletions
diff --git a/ld_script.txt b/ld_script.txt index 68fcaf28b..b04f63721 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -644,7 +644,7 @@ SECTIONS { 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); + sound/songs/midi/se_o.o(.rodata); sound/songs/midi/se_n.o(.rodata); sound/songs/se_seikai.o(.rodata); sound/songs/midi/se_hazure.o(.rodata); @@ -972,5 +972,8 @@ $(MID_SUBDIR)/se_naminori.s: %.s: %.mid $(MID_SUBDIR)/se_nigeru.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 +$(MID_SUBDIR)/se_o.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_o.mid b/sound/songs/midi/se_o.mid Binary files differnew file mode 100644 index 000000000..5dfc32727 --- /dev/null +++ b/sound/songs/midi/se_o.mid diff --git a/sound/songs/se_o.s b/sound/songs/se_o.s deleted file mode 100644 index a9c294f66..000000000 --- a/sound/songs/se_o.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_o_grp, voicegroup128 - .equ se_o_pri, 4 - .equ se_o_rev, reverb_set+50 - .equ se_o_mvl, 127 - .equ se_o_key, 0 - .equ se_o_tbs, 1 - .equ se_o_exg, 0 - .equ se_o_cmp, 1 - - .section .rodata - .global se_o - .align 2 - -@********************** Track 1 **********************@ - -se_o_1: - .byte KEYSH , se_o_key+0 - .byte TEMPO , 240*se_o_tbs/2 - .byte VOICE , 126 - .byte BENDR , 12 - .byte VOL , 120*se_o_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_o: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_o_pri @ Priority - .byte se_o_rev @ Reverb. - - .word se_o_grp - - .word se_o_1 - - .end |