diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:03:27 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:03:27 -0400 |
| commit | 9817919c23f0f7f576cc8f3a3a45b0246687ef01 (patch) | |
| tree | a39700f3db48dba187ad55ac899f3b8e567a6e7e | |
| parent | 13c617cee00b56258d9395829b66cef954c054bc (diff) | |
Match se_hantei2.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_hantei2.mid | bin | 0 -> 143 bytes | |||
| -rw-r--r-- | sound/songs/se_hantei2.s | 70 |
4 files changed, 4 insertions, 71 deletions
diff --git a/ld_script.txt b/ld_script.txt index 0ef95f865..a62ecf6c7 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -830,7 +830,7 @@ SECTIONS { sound/songs/se_toreeye.o(.rodata); sound/songs/se_toreoff.o(.rodata); sound/songs/midi/se_hantei1.o(.rodata); - sound/songs/se_hantei2.o(.rodata); + sound/songs/midi/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); sound/songs/midi/se_curtain1.o(.rodata); sound/songs/se_ussoki.o(.rodata); @@ -888,5 +888,8 @@ $(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid $(MID_SUBDIR)/se_hantei1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_hantei2.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_hantei2.mid b/sound/songs/midi/se_hantei2.mid Binary files differnew file mode 100644 index 000000000..06698dde9 --- /dev/null +++ b/sound/songs/midi/se_hantei2.mid diff --git a/sound/songs/se_hantei2.s b/sound/songs/se_hantei2.s deleted file mode 100644 index a10a14f41..000000000 --- a/sound/songs/se_hantei2.s +++ /dev/null @@ -1,70 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hantei2_grp, voicegroup129 - .equ se_hantei2_pri, 5 - .equ se_hantei2_rev, reverb_set+50 - .equ se_hantei2_mvl, 127 - .equ se_hantei2_key, 0 - .equ se_hantei2_tbs, 1 - .equ se_hantei2_exg, 0 - .equ se_hantei2_cmp, 1 - - .section .rodata - .global se_hantei2 - .align 2 - -@********************** Track 1 **********************@ - -se_hantei2_1: - .byte KEYSH , se_hantei2_key+0 - .byte TEMPO , 92*se_hantei2_tbs/2 - .byte VOICE , 116 - .byte VOL , 127*se_hantei2_mvl/mxv - .byte PAN , c_v-62 - .byte N04 , Fn3 , v127 - .byte W04 - .byte VOICE , 10 - .byte N04 , Cn3 - .byte W05 - .byte VOICE , 116 - .byte N32 , Fn3 - .byte W03 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_hantei2_2: - .byte KEYSH , se_hantei2_key+0 - .byte VOICE , 117 - .byte VOL , 127*se_hantei2_mvl/mxv - .byte PAN , c_v+63 - .byte BEND , c_v+1 - .byte N04 , Gn3 , v100 - .byte W04 - .byte Dn3 - .byte W05 - .byte N32 , Gn3 - .byte W03 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_hantei2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_hantei2_pri @ Priority - .byte se_hantei2_rev @ Reverb. - - .word se_hantei2_grp - - .word se_hantei2_1 - .word se_hantei2_2 - - .end |