diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:29:16 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:29:16 -0400 |
| commit | 76e3091d6de18ce8a96ead0c34c83316b5dc3daa (patch) | |
| tree | 16b90885d960047ed0e5ad8a327bf8eaa85c10ae | |
| parent | 1aae1c19ea293a280527315840c87081bd10e6d0 (diff) | |
Match se_kaidan.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_kaidan.mid | bin | 0 -> 124 bytes | |||
| -rw-r--r-- | sound/songs/se_kaidan.s | 61 |
4 files changed, 4 insertions, 62 deletions
diff --git a/ld_script.txt b/ld_script.txt index 1c1ff43ea..16596f7ac 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -573,7 +573,7 @@ SECTIONS { sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); sound/songs/midi/se_door.o(.rodata); - sound/songs/se_kaidan.o(.rodata); + sound/songs/midi/se_kaidan.o(.rodata); sound/songs/midi/se_dansa.o(.rodata); sound/songs/midi/se_jitensya.o(.rodata); sound/songs/se_kouka_l.o(.rodata); @@ -921,5 +921,8 @@ $(MID_SUBDIR)/se_jitensya.s: %.s: %.mid $(MID_SUBDIR)/se_jyuni.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 +$(MID_SUBDIR)/se_kaidan.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kaidan.mid b/sound/songs/midi/se_kaidan.mid Binary files differnew file mode 100644 index 000000000..575307d86 --- /dev/null +++ b/sound/songs/midi/se_kaidan.mid diff --git a/sound/songs/se_kaidan.s b/sound/songs/se_kaidan.s deleted file mode 100644 index 3563c4062..000000000 --- a/sound/songs/se_kaidan.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kaidan_grp, voicegroup127 - .equ se_kaidan_pri, 5 - .equ se_kaidan_rev, reverb_set+50 - .equ se_kaidan_mvl, 127 - .equ se_kaidan_key, 0 - .equ se_kaidan_tbs, 1 - .equ se_kaidan_exg, 0 - .equ se_kaidan_cmp, 1 - - .section .rodata - .global se_kaidan - .align 2 - -@********************** Track 1 **********************@ - -se_kaidan_1: - .byte KEYSH , se_kaidan_key+0 - .byte TEMPO , 120*se_kaidan_tbs/2 - .byte VOICE , 126 - .byte VOL , 120*se_kaidan_mvl/mxv - .byte N02 , An2 , v068 - .byte W02 - .byte Cn3 , v127 - .byte W01 - .byte W01 - .byte En4 , v068 - .byte W02 - .byte W03 - .byte W03 - .byte An2 - .byte W02 - .byte Cn3 , v100 - .byte W01 - .byte W01 - .byte En4 , v068 - .byte W02 - .byte W03 - .byte W03 - .byte An2 , v032 - .byte W02 - .byte Cn3 , v052 - .byte W01 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_kaidan: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_kaidan_pri @ Priority - .byte se_kaidan_rev @ Reverb. - - .word se_kaidan_grp - - .word se_kaidan_1 - - .end |