diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:19:16 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:19:16 -0500 |
| commit | 964c943feef487c1ae2e3362a9e20c2599b107fe (patch) | |
| tree | 8eacbd40f7f17e07fa1512b5c575f1dadc5f98b0 | |
| parent | e6484d42e92956d311bea8feb978c079a2c50be1 (diff) | |
Match se_nigeru.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_nigeru.mid | bin | 0 -> 164 bytes | |||
| -rw-r--r-- | sound/songs/se_nigeru.s | 64 |
4 files changed, 4 insertions, 65 deletions
diff --git a/ld_script.txt b/ld_script.txt index 63260bd81..68fcaf28b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -632,7 +632,7 @@ SECTIONS { sound/songs/midi/se_kouka_h.o(.rodata); sound/songs/midi/se_bowa2.o(.rodata); sound/songs/se_poke_dead.o(.rodata); - sound/songs/se_nigeru.o(.rodata); + sound/songs/midi/se_nigeru.o(.rodata); sound/songs/midi/se_jido_doa.o(.rodata); sound/songs/midi/se_naminori.o(.rodata); sound/songs/midi/se_ban.o(.rodata); @@ -969,5 +969,8 @@ $(MID_SUBDIR)/se_nageru.s: %.s: %.mid $(MID_SUBDIR)/se_naminori.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4 +$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_nigeru.mid Binary files differnew file mode 100644 index 000000000..faf37d529 --- /dev/null +++ b/sound/songs/midi/se_nigeru.mid diff --git a/sound/songs/se_nigeru.s b/sound/songs/se_nigeru.s deleted file mode 100644 index babc7868d..000000000 --- a/sound/songs/se_nigeru.s +++ /dev/null @@ -1,64 +0,0 @@ - .include "MPlayDef.s" - - .equ se_nigeru_grp, voicegroup127 - .equ se_nigeru_pri, 5 - .equ se_nigeru_rev, reverb_set+50 - .equ se_nigeru_mvl, 127 - .equ se_nigeru_key, 0 - .equ se_nigeru_tbs, 1 - .equ se_nigeru_exg, 0 - .equ se_nigeru_cmp, 1 - - .section .rodata - .global se_nigeru - .align 2 - -@********************** Track 1 **********************@ - -se_nigeru_1: - .byte KEYSH , se_nigeru_key+0 - .byte TEMPO , 150*se_nigeru_tbs/2 - .byte VOICE , 126 - .byte VOL , 90*se_nigeru_mvl/mxv - .byte N03 , Fn4 , v120 - .byte W03 - .byte Gs4 , v112 - .byte W03 - .byte N02 , Fs3 - .byte W03 - .byte N03 , Gs4 , v072 - .byte W03 - .byte N02 , Fs3 , v096 - .byte W03 - .byte N03 , Gs4 , v056 - .byte W03 - .byte N02 , Fs3 , v080 - .byte W03 - .byte N03 , Gs4 , v040 - .byte W03 - .byte N02 , Fs3 , v064 - .byte W03 - .byte N03 , Gs4 , v024 - .byte W03 - .byte N02 , Fs3 , v048 - .byte W03 - .byte N03 , Gs4 , v020 - .byte W03 - .byte Fs3 , v028 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_nigeru: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_nigeru_pri @ Priority - .byte se_nigeru_rev @ Reverb. - - .word se_nigeru_grp - - .word se_nigeru_1 - - .end |