diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2019-03-24 15:57:24 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-24 16:37:27 -0500 |
| commit | d82b198820051cdcadee612f26028a64321bd687 (patch) | |
| tree | 5c25ea6b44a14a7e5d334374d3090c9e87612765 | |
| parent | 6881c256c41f30b8ad4addbeb52a4f7609514d75 (diff) | |
Match se_tamakoro_e.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_tamakoro_e.mid | bin | 0 -> 163 bytes | |||
| -rw-r--r-- | sound/songs/se_tamakoro_e.s | 75 |
4 files changed, 4 insertions, 76 deletions
diff --git a/ld_script.txt b/ld_script.txt index 360fa0ad6..41d1a468d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -727,7 +727,7 @@ SECTIONS { sound/songs/midi/se_hinsi.o(.rodata); sound/songs/midi/se_expmax.o(.rodata); sound/songs/midi/se_tamakoro.o(.rodata); - sound/songs/se_tamakoro_e.o(.rodata); + sound/songs/midi/se_tamakoro_e.o(.rodata); sound/songs/midi/se_basabasa.o(.rodata); sound/songs/midi/se_regi.o(.rodata); sound/songs/midi/se_c_gaji.o(.rodata); @@ -1110,5 +1110,8 @@ $(MID_SUBDIR)/se_tamago.s: %.s: %.mid $(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 +$(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_tamakoro_e.mid b/sound/songs/midi/se_tamakoro_e.mid Binary files differnew file mode 100644 index 000000000..13675c690 --- /dev/null +++ b/sound/songs/midi/se_tamakoro_e.mid diff --git a/sound/songs/se_tamakoro_e.s b/sound/songs/se_tamakoro_e.s deleted file mode 100644 index db16f06b5..000000000 --- a/sound/songs/se_tamakoro_e.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamakoro_e_grp, voicegroup128 - .equ se_tamakoro_e_pri, 2 - .equ se_tamakoro_e_rev, reverb_set+50 - .equ se_tamakoro_e_mvl, 127 - .equ se_tamakoro_e_key, 0 - .equ se_tamakoro_e_tbs, 1 - .equ se_tamakoro_e_exg, 0 - .equ se_tamakoro_e_cmp, 1 - - .section .rodata - .global se_tamakoro_e - .align 2 - -@********************** Track 1 **********************@ - -se_tamakoro_e_1: - .byte KEYSH , se_tamakoro_e_key+0 - .byte TEMPO , 150*se_tamakoro_e_tbs/2 - .byte VOICE , 63 - .byte BENDR , 6 - .byte VOL , 110*se_tamakoro_e_mvl/mxv - .byte BEND , c_v+0 - .byte N72 , Dn3 , v127 - .byte W06 - .byte VOL , 107*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-3 - .byte W06 - .byte VOL , 106*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-5 - .byte W06 - .byte VOL , 104*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-7 - .byte W06 - .byte VOL , 102*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-10 - .byte W06 - .byte VOL , 97*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-12 - .byte W06 - .byte VOL , 90*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-14 - .byte W06 - .byte VOL , 73*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-19 - .byte W06 - .byte VOL , 58*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte VOL , 40*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-29 - .byte W06 - .byte VOL , 25*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-35 - .byte W06 - .byte VOL , 12*se_tamakoro_e_mvl/mxv - .byte BEND , c_v-46 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_tamakoro_e: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamakoro_e_pri @ Priority - .byte se_tamakoro_e_rev @ Reverb. - - .word se_tamakoro_e_grp - - .word se_tamakoro_e_1 - - .end |