diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:26:20 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 15:26:20 -0400 |
| commit | 264bd34bdd84610177f02704294cc0515b9e27c2 (patch) | |
| tree | f88d9502e8a502d3e0636f5549b961db3a613d6a | |
| parent | 615ad808bf001d2737112e7467f0a1a260e51ba3 (diff) | |
Match se_door.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_door.mid | bin | 0 -> 76 bytes | |||
| -rw-r--r-- | sound/songs/se_door.s | 42 |
4 files changed, 4 insertions, 43 deletions
diff --git a/ld_script.txt b/ld_script.txt index 3463c9fd9..59b3a790b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -572,7 +572,7 @@ SECTIONS { sound/songs/se_select.o(.rodata); sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); - sound/songs/se_door.o(.rodata); + sound/songs/midi/se_door.o(.rodata); sound/songs/se_kaidan.o(.rodata); sound/songs/midi/se_dansa.o(.rodata); sound/songs/se_jitensya.o(.rodata); @@ -849,5 +849,8 @@ $(MID_SUBDIR)/se_dendou.s: %.s: %.mid $(MID_SUBDIR)/se_doku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 +$(MID_SUBDIR)/se_door.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_door.mid b/sound/songs/midi/se_door.mid Binary files differnew file mode 100644 index 000000000..004889e93 --- /dev/null +++ b/sound/songs/midi/se_door.mid diff --git a/sound/songs/se_door.s b/sound/songs/se_door.s deleted file mode 100644 index e4b23dddd..000000000 --- a/sound/songs/se_door.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "MPlayDef.s" - - .equ se_door_grp, voicegroup127 - .equ se_door_pri, 5 - .equ se_door_rev, reverb_set+50 - .equ se_door_mvl, 127 - .equ se_door_key, 0 - .equ se_door_tbs, 1 - .equ se_door_exg, 0 - .equ se_door_cmp, 1 - - .section .rodata - .global se_door - .align 2 - -@********************** Track 1 **********************@ - -se_door_1: - .byte KEYSH , se_door_key+0 - .byte TEMPO , 110*se_door_tbs/2 - .byte VOICE , 127 - .byte VOL , 80*se_door_mvl/mxv - .byte N03 , Dn3 , v127 - .byte W06 - .byte N12 , Fs3 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_door: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_door_pri @ Priority - .byte se_door_rev @ Reverb. - - .word se_door_grp - - .word se_door_1 - - .end |