diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_kon4.mid | bin | 0 -> 103 bytes | |||
| -rw-r--r-- | sound/songs/se_kon4.s | 53 |
4 files changed, 4 insertions, 54 deletions
diff --git a/ld_script.txt b/ld_script.txt index e961e3481..f933ee315 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -623,7 +623,7 @@ SECTIONS { sound/songs/midi/se_kon.o(.rodata); sound/songs/midi/se_kon2.o(.rodata); sound/songs/midi/se_kon3.o(.rodata); - sound/songs/se_kon4.o(.rodata); + sound/songs/midi/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); sound/songs/se_nageru.o(.rodata); sound/songs/se_toy_c.o(.rodata); @@ -939,5 +939,8 @@ $(MID_SUBDIR)/se_kon2.s: %.s: %.mid $(MID_SUBDIR)/se_kon3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon4.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_kon4.mid b/sound/songs/midi/se_kon4.mid Binary files differnew file mode 100644 index 000000000..b0f5561b9 --- /dev/null +++ b/sound/songs/midi/se_kon4.mid diff --git a/sound/songs/se_kon4.s b/sound/songs/se_kon4.s deleted file mode 100644 index 4dfe81e34..000000000 --- a/sound/songs/se_kon4.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon4_grp, voicegroup128 - .equ se_kon4_pri, 4 - .equ se_kon4_rev, reverb_set+50 - .equ se_kon4_mvl, 127 - .equ se_kon4_key, 0 - .equ se_kon4_tbs, 1 - .equ se_kon4_exg, 0 - .equ se_kon4_cmp, 1 - - .section .rodata - .global se_kon4 - .align 2 - -@********************** Track 1 **********************@ - -se_kon4_1: - .byte KEYSH , se_kon4_key+0 - .byte TEMPO , 150*se_kon4_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon4_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v076 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon4_2: - .byte KEYSH , se_kon4_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon4_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v056 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon4: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon4_pri @ Priority - .byte se_kon4_rev @ Reverb. - - .word se_kon4_grp - - .word se_kon4_1 - .word se_kon4_2 - - .end |