diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 18:10:25 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 18:10:25 -0500 |
| commit | 27d46fa3a8542615de455bcc9068480ed1b5a44d (patch) | |
| tree | 740c08cbccb7f48b3323d9ef9008d9ab6a140e49 | |
| parent | 60a7134710686515776e321e1d32ddf2dc97442a (diff) | |
Match se_t_ooame_e.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_t_ooame_e.mid | bin | 0 -> 134 bytes | |||
| -rw-r--r-- | sound/songs/se_t_ooame_e.s | 74 |
4 files changed, 4 insertions, 75 deletions
diff --git a/ld_script.txt b/ld_script.txt index 171aa9362..635f09662 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -699,7 +699,7 @@ SECTIONS { sound/songs/midi/se_t_ame.o(.rodata); sound/songs/midi/se_t_ame_e.o(.rodata); sound/songs/midi/se_t_ooame.o(.rodata); - sound/songs/se_t_ooame_e.o(.rodata); + sound/songs/midi/se_t_ooame_e.o(.rodata); sound/songs/midi/se_t_koame.o(.rodata); sound/songs/midi/se_t_koame_e.o(.rodata); sound/songs/midi/se_t_kami.o(.rodata); @@ -1098,5 +1098,8 @@ $(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid $(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 +$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_t_ooame_e.mid Binary files differnew file mode 100644 index 000000000..b73010142 --- /dev/null +++ b/sound/songs/midi/se_t_ooame_e.mid diff --git a/sound/songs/se_t_ooame_e.s b/sound/songs/se_t_ooame_e.s deleted file mode 100644 index 329cd3702..000000000 --- a/sound/songs/se_t_ooame_e.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ooame_e_grp, voicegroup128 - .equ se_t_ooame_e_pri, 2 - .equ se_t_ooame_e_rev, reverb_set+50 - .equ se_t_ooame_e_mvl, 127 - .equ se_t_ooame_e_key, 0 - .equ se_t_ooame_e_tbs, 1 - .equ se_t_ooame_e_exg, 0 - .equ se_t_ooame_e_cmp, 1 - - .section .rodata - .global se_t_ooame_e - .align 2 - -@********************** Track 1 **********************@ - -se_t_ooame_e_1: - .byte KEYSH , se_t_ooame_e_key+0 - .byte TEMPO , 220*se_t_ooame_e_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 100*se_t_ooame_e_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Cn3 , v060 - .byte W03 - .byte VOL , 96*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 93*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 90*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 85*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 81*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 73*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 62*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 55*se_t_ooame_e_mvl/mxv - .byte N24 - .byte W03 - .byte VOL , 48*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 42*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 33*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 25*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 18*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 12*se_t_ooame_e_mvl/mxv - .byte W03 - .byte 7*se_t_ooame_e_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ooame_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ooame_e_pri @ Priority - .byte se_t_ooame_e_rev @ Reverb. - - .word se_t_ooame_e_grp - - .word se_t_ooame_e_1 - - .end |