diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:13:22 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:13:22 -0500 |
| commit | 9c46276911cae9b39ff3ba414b416d0e5ad2c690 (patch) | |
| tree | 616cb026a335c7a533c1ac22b1afc15e5a67a572 | |
| parent | 59d691a5eed028301dedd73ee13baca43b8bd7ce (diff) | |
Match se_nageru.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_nageru.mid | bin | 0 -> 133 bytes | |||
| -rw-r--r-- | sound/songs/se_nageru.s | 64 |
4 files changed, 4 insertions, 65 deletions
diff --git a/ld_script.txt b/ld_script.txt index 469eb8fad..7818c5ca6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -676,7 +676,7 @@ SECTIONS { sound/songs/midi/se_kon3.o(.rodata); sound/songs/midi/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); - sound/songs/se_nageru.o(.rodata); + sound/songs/midi/se_nageru.o(.rodata); sound/songs/se_toy_c.o(.rodata); sound/songs/se_toy_d.o(.rodata); sound/songs/se_toy_e.o(.rodata); @@ -963,5 +963,8 @@ $(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid $(MID_SUBDIR)/se_n.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 +$(MID_SUBDIR)/se_nageru.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_nageru.mid Binary files differnew file mode 100644 index 000000000..171f45a5a --- /dev/null +++ b/sound/songs/midi/se_nageru.mid diff --git a/sound/songs/se_nageru.s b/sound/songs/se_nageru.s deleted file mode 100644 index 379b790bd..000000000 --- a/sound/songs/se_nageru.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - - .equ se_nageru_grp, voicegroup128 - .equ se_nageru_pri, 5 - .equ se_nageru_rev, reverb_set+50 - .equ se_nageru_mvl, 127 - .equ se_nageru_key, 0 - .equ se_nageru_tbs, 1 - .equ se_nageru_exg, 0 - .equ se_nageru_cmp, 1 - - .section .rodata - .global se_nageru - .align 2 - -@********************** Track 1 **********************@ - -se_nageru_1: - .byte KEYSH , se_nageru_key+0 - .byte TEMPO , 150*se_nageru_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte VOL , 120*se_nageru_mvl/mxv - .byte BEND , c_v+12 - .byte N06 , An2 , v127 - .byte W03 - .byte VOL , 78*se_nageru_mvl/mxv - .byte BEND , c_v+20 - .byte W03 - .byte VOL , 120*se_nageru_mvl/mxv - .byte BEND , c_v+36 - .byte N18 , Cn3 - .byte W02 - .byte BEND , c_v+35 - .byte W03 - .byte c_v+32 - .byte W02 - .byte c_v+26 - .byte W03 - .byte VOL , 102*se_nageru_mvl/mxv - .byte BEND , c_v+18 - .byte W02 - .byte VOL , 68*se_nageru_mvl/mxv - .byte BEND , c_v+7 - .byte W03 - .byte VOL , 34*se_nageru_mvl/mxv - .byte BEND , c_v-9 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_nageru: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_nageru_pri @ Priority - .byte se_nageru_rev @ Reverb. - - .word se_nageru_grp - - .word se_nageru_1 - - .end |