diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:24:39 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:24:39 -0400 |
| commit | 938c4a2bc699695526443e9c75112cd8b457c22a (patch) | |
| tree | 41432370cfe464bdc993a16c6990ad765f0daab1 | |
| parent | 72c9abbb667dfb8ec1c596559b97c7571d1084cf (diff) | |
Match se_a.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_a.mid | bin | 0 -> 75 bytes | |||
| -rw-r--r-- | sound/songs/se_a.s | 45 |
4 files changed, 4 insertions, 46 deletions
diff --git a/ld_script.txt b/ld_script.txt index 43a556034..7814be677 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -589,7 +589,7 @@ SECTIONS { sound/songs/se_boo.o(.rodata); sound/songs/se_bowa.o(.rodata); sound/songs/se_jyuni.o(.rodata); - sound/songs/se_a.o(.rodata); + sound/songs/midi/se_a.o(.rodata); sound/songs/se_i.o(.rodata); sound/songs/se_u.o(.rodata); sound/songs/se_e.o(.rodata); @@ -786,5 +786,8 @@ $(MID_SUBDIR)/ph_trap_held.s: %.s: %.mid $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 +$(MID_SUBDIR)/se_a.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_a.mid b/sound/songs/midi/se_a.mid Binary files differnew file mode 100644 index 000000000..e44a27926 --- /dev/null +++ b/sound/songs/midi/se_a.mid diff --git a/sound/songs/se_a.s b/sound/songs/se_a.s deleted file mode 100644 index 860a9aa27..000000000 --- a/sound/songs/se_a.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_a_grp, voicegroup128 - .equ se_a_pri, 4 - .equ se_a_rev, reverb_set+50 - .equ se_a_mvl, 127 - .equ se_a_key, 0 - .equ se_a_tbs, 1 - .equ se_a_exg, 0 - .equ se_a_cmp, 1 - - .section .rodata - .global se_a - .align 2 - -@********************** Track 1 **********************@ - -se_a_1: - .byte KEYSH , se_a_key+0 - .byte TEMPO , 240*se_a_tbs/2 - .byte VOICE , 122 - .byte BENDR , 12 - .byte VOL , 95*se_a_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Cn3 , v127 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_a: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_a_pri @ Priority - .byte se_a_rev @ Reverb. - - .word se_a_grp - - .word se_a_1 - - .end |