diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:40:18 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:40:18 -0400 |
| commit | e6685e5703b8f8c37055f73118c92622160b4fd8 (patch) | |
| tree | ed1d7e88d13028894190c20e0b233899268f8468 | |
| parent | a9bdd34f9ea12868176375d535cd88d7f21e7668 (diff) | |
Match se_kon2.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_kon2.mid | bin | 0 -> 103 bytes | |||
| -rw-r--r-- | sound/songs/se_kon2.s | 53 |
4 files changed, 4 insertions, 54 deletions
diff --git a/ld_script.txt b/ld_script.txt index d0faf6185..aaf08d042 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -621,7 +621,7 @@ SECTIONS { sound/songs/midi/se_card.o(.rodata); sound/songs/se_save.o(.rodata); sound/songs/midi/se_kon.o(.rodata); - sound/songs/se_kon2.o(.rodata); + sound/songs/midi/se_kon2.o(.rodata); sound/songs/se_kon3.o(.rodata); sound/songs/se_kon4.o(.rodata); sound/songs/se_suikomu.o(.rodata); @@ -933,5 +933,8 @@ $(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid $(MID_SUBDIR)/se_kon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 +$(MID_SUBDIR)/se_kon2.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_kon2.mid b/sound/songs/midi/se_kon2.mid Binary files differnew file mode 100644 index 000000000..961d82642 --- /dev/null +++ b/sound/songs/midi/se_kon2.mid diff --git a/sound/songs/se_kon2.s b/sound/songs/se_kon2.s deleted file mode 100644 index 127532686..000000000 --- a/sound/songs/se_kon2.s +++ /dev/null @@ -1,53 +0,0 @@ - .include "MPlayDef.s" - - .equ se_kon2_grp, voicegroup128 - .equ se_kon2_pri, 4 - .equ se_kon2_rev, reverb_set+50 - .equ se_kon2_mvl, 127 - .equ se_kon2_key, 0 - .equ se_kon2_tbs, 1 - .equ se_kon2_exg, 0 - .equ se_kon2_cmp, 1 - - .section .rodata - .global se_kon2 - .align 2 - -@********************** Track 1 **********************@ - -se_kon2_1: - .byte KEYSH , se_kon2_key+0 - .byte TEMPO , 150*se_kon2_tbs/2 - .byte VOICE , 16 - .byte VOL , 100*se_kon2_mvl/mxv - .byte BEND , c_v+1 - .byte N12 , Fn4 , v100 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_kon2_2: - .byte KEYSH , se_kon2_key+0 - .byte VOICE , 17 - .byte VOL , 100*se_kon2_mvl/mxv - .byte BEND , c_v+0 - .byte N09 , Fn4 , v088 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_kon2: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_kon2_pri @ Priority - .byte se_kon2_rev @ Reverb. - - .word se_kon2_grp - - .word se_kon2_1 - .word se_kon2_2 - - .end |