diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:55:18 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:55:18 -0500 |
| commit | a00079e63b31815dc86cc31120f5c0b19dcd2f66 (patch) | |
| tree | 72ca35263a436ac15181f64d777536f4a0edccf8 | |
| parent | 88167d3183c82c9f4eda27940a2a176a3bfbf375 (diff) | |
Match se_suikomu.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_suikomu.mid | bin | 0 -> 156 bytes | |||
| -rw-r--r-- | sound/songs/se_suikomu.s | 78 |
4 files changed, 4 insertions, 79 deletions
diff --git a/ld_script.txt b/ld_script.txt index 401c9c784..e79826fab 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -675,7 +675,7 @@ SECTIONS { sound/songs/midi/se_kon2.o(.rodata); sound/songs/midi/se_kon3.o(.rodata); sound/songs/midi/se_kon4.o(.rodata); - sound/songs/se_suikomu.o(.rodata); + sound/songs/midi/se_suikomu.o(.rodata); sound/songs/midi/se_nageru.o(.rodata); sound/songs/se_toy_c.o(.rodata); sound/songs/se_toy_d.o(.rodata); @@ -1074,5 +1074,8 @@ $(MID_SUBDIR)/se_seikai.s: %.s: %.mid $(MID_SUBDIR)/se_select.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 +$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_suikomu.mid Binary files differnew file mode 100644 index 000000000..871c8e5d3 --- /dev/null +++ b/sound/songs/midi/se_suikomu.mid diff --git a/sound/songs/se_suikomu.s b/sound/songs/se_suikomu.s deleted file mode 100644 index eff89df3a..000000000 --- a/sound/songs/se_suikomu.s +++ /dev/null @@ -1,78 +0,0 @@ - .include "MPlayDef.s" - - .equ se_suikomu_grp, voicegroup127 - .equ se_suikomu_pri, 5 - .equ se_suikomu_rev, reverb_set+50 - .equ se_suikomu_mvl, 127 - .equ se_suikomu_key, 0 - .equ se_suikomu_tbs, 1 - .equ se_suikomu_exg, 0 - .equ se_suikomu_cmp, 1 - - .section .rodata - .global se_suikomu - .align 2 - -@********************** Track 1 **********************@ - -se_suikomu_1: - .byte KEYSH , se_suikomu_key+0 - .byte VOICE , 13 - .byte BENDR , 12 - .byte VOL , 12*se_suikomu_mvl/mxv - .byte BEND , c_v+49 - .byte N06 , Gn4 , v080 - .byte W01 - .byte VOL , 44*se_suikomu_mvl/mxv - .byte BEND , c_v+22 - .byte W01 - .byte VOL , 75*se_suikomu_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte VOL , 87*se_suikomu_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 100*se_suikomu_mvl/mxv - .byte BEND , c_v+54 - .byte W01 - .byte c_v+63 - .byte W01 - .byte W03 - .byte N03 , Gn4 , v040 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_suikomu_2: - .byte KEYSH , se_suikomu_key+0 - .byte VOICE , 123 - .byte VOL , 59*se_suikomu_mvl/mxv - .byte N06 , Gs4 , v052 - .byte W01 - .byte VOL , 72*se_suikomu_mvl/mxv - .byte W01 - .byte 90*se_suikomu_mvl/mxv - .byte W01 - .byte 100*se_suikomu_mvl/mxv - .byte W03 - .byte W03 - .byte N03 , Gs4 , v024 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_suikomu: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_suikomu_pri @ Priority - .byte se_suikomu_rev @ Reverb. - - .word se_suikomu_grp - - .word se_suikomu_1 - .word se_suikomu_2 - - .end |