diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_poke_dead.mid | bin | 0 -> 161 bytes | |||
| -rw-r--r-- | sound/songs/se_poke_dead.s | 84 |
4 files changed, 4 insertions, 85 deletions
diff --git a/ld_script.txt b/ld_script.txt index b3c9b6f46..59c0d3fb0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -631,7 +631,7 @@ SECTIONS { sound/songs/midi/se_kouka_m.o(.rodata); sound/songs/midi/se_kouka_h.o(.rodata); sound/songs/midi/se_bowa2.o(.rodata); - sound/songs/se_poke_dead.o(.rodata); + sound/songs/midi/se_poke_dead.o(.rodata); sound/songs/midi/se_nigeru.o(.rodata); sound/songs/midi/se_jido_doa.o(.rodata); sound/songs/midi/se_naminori.o(.rodata); @@ -999,5 +999,8 @@ $(MID_SUBDIR)/se_pn_off.s: %.s: %.mid $(MID_SUBDIR)/se_pn_on.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_poke_dead.mid Binary files differnew file mode 100644 index 000000000..b6a0df4c8 --- /dev/null +++ b/sound/songs/midi/se_poke_dead.mid diff --git a/sound/songs/se_poke_dead.s b/sound/songs/se_poke_dead.s deleted file mode 100644 index 0d66039a2..000000000 --- a/sound/songs/se_poke_dead.s +++ /dev/null @@ -1,84 +0,0 @@ - .include "MPlayDef.s" - - .equ se_poke_dead_grp, voicegroup127 - .equ se_poke_dead_pri, 5 - .equ se_poke_dead_rev, reverb_set+50 - .equ se_poke_dead_mvl, 127 - .equ se_poke_dead_key, 0 - .equ se_poke_dead_tbs, 1 - .equ se_poke_dead_exg, 0 - .equ se_poke_dead_cmp, 1 - - .section .rodata - .global se_poke_dead - .align 2 - -@********************** Track 1 **********************@ - -se_poke_dead_1: - .byte KEYSH , se_poke_dead_key+0 - .byte TEMPO , 90*se_poke_dead_tbs/2 - .byte VOICE , 90 - .byte VOL , 110*se_poke_dead_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Cn4 , v100 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_poke_dead_2: - .byte KEYSH , se_poke_dead_key+0 - .byte VOICE , 124 - .byte BENDR , 12 - .byte VOL , 82*se_poke_dead_mvl/mxv - .byte BEND , c_v+0 - .byte N05 , Gs4 , v060 - .byte W03 - .byte VOL , 94*se_poke_dead_mvl/mxv - .byte W03 - .byte 103*se_poke_dead_mvl/mxv - .byte N22 - .byte W03 - .byte VOL , 110*se_poke_dead_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@********************** Track 3 **********************@ - -se_poke_dead_3: - .byte KEYSH , se_poke_dead_key+0 - .byte VOICE , 0 - .byte VOL , 110*se_poke_dead_mvl/mxv - .byte N06 , Cn3 , v080 - .byte W06 - .byte N18 , Cn3 , v092 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_poke_dead: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_poke_dead_pri @ Priority - .byte se_poke_dead_rev @ Reverb. - - .word se_poke_dead_grp - - .word se_poke_dead_1 - .word se_poke_dead_2 - .word se_poke_dead_3 - - .end |