diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 18:02:42 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 18:02:42 -0500 |
| commit | 67d2009d7dc2568f00ee3d29128f1b22627e8670 (patch) | |
| tree | a541343fada10543c021fcabaaf8e384a7e08849 | |
| parent | 5395fc8b57c204c6d334311a549f817c10192b74 (diff) | |
Match se_t_ame_e.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_t_ame_e.mid | bin | 0 -> 134 bytes | |||
| -rw-r--r-- | sound/songs/se_t_ame_e.s | 74 |
4 files changed, 4 insertions, 75 deletions
diff --git a/ld_script.txt b/ld_script.txt index a12d5b16a..746ed9e51 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -697,7 +697,7 @@ SECTIONS { sound/songs/midi/se_doku.o(.rodata); sound/songs/midi/se_esuka.o(.rodata); sound/songs/midi/se_t_ame.o(.rodata); - sound/songs/se_t_ame_e.o(.rodata); + sound/songs/midi/se_t_ame_e.o(.rodata); sound/songs/se_t_ooame.o(.rodata); sound/songs/se_t_ooame_e.o(.rodata); sound/songs/midi/se_t_koame.o(.rodata); @@ -1080,6 +1080,9 @@ $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid $(MID_SUBDIR)/se_t_ame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 +$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 + $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_t_ame_e.mid Binary files differnew file mode 100644 index 000000000..2397eea64 --- /dev/null +++ b/sound/songs/midi/se_t_ame_e.mid diff --git a/sound/songs/se_t_ame_e.s b/sound/songs/se_t_ame_e.s deleted file mode 100644 index 5558a5118..000000000 --- a/sound/songs/se_t_ame_e.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ame_e_grp, voicegroup128 - .equ se_t_ame_e_pri, 2 - .equ se_t_ame_e_rev, reverb_set+50 - .equ se_t_ame_e_mvl, 127 - .equ se_t_ame_e_key, 0 - .equ se_t_ame_e_tbs, 1 - .equ se_t_ame_e_exg, 0 - .equ se_t_ame_e_cmp, 1 - - .section .rodata - .global se_t_ame_e - .align 2 - -@********************** Track 1 **********************@ - -se_t_ame_e_1: - .byte KEYSH , se_t_ame_e_key+0 - .byte TEMPO , 220*se_t_ame_e_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 80*se_t_ame_e_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v060 - .byte W03 - .byte VOL , 76*se_t_ame_e_mvl/mxv - .byte W03 - .byte 74*se_t_ame_e_mvl/mxv - .byte W03 - .byte 72*se_t_ame_e_mvl/mxv - .byte W03 - .byte 68*se_t_ame_e_mvl/mxv - .byte W03 - .byte 64*se_t_ame_e_mvl/mxv - .byte W03 - .byte 58*se_t_ame_e_mvl/mxv - .byte W03 - .byte 50*se_t_ame_e_mvl/mxv - .byte W03 - .byte 44*se_t_ame_e_mvl/mxv - .byte N24 - .byte W03 - .byte VOL , 38*se_t_ame_e_mvl/mxv - .byte W03 - .byte 34*se_t_ame_e_mvl/mxv - .byte W03 - .byte 27*se_t_ame_e_mvl/mxv - .byte W03 - .byte 20*se_t_ame_e_mvl/mxv - .byte W03 - .byte 15*se_t_ame_e_mvl/mxv - .byte W03 - .byte 10*se_t_ame_e_mvl/mxv - .byte W03 - .byte 6*se_t_ame_e_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ame_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ame_e_pri @ Priority - .byte se_t_ame_e_rev @ Reverb. - - .word se_t_ame_e_grp - - .word se_t_ame_e_1 - - .end |