diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_ki_gasyan.mid | bin | 0 -> 152 bytes | |||
| -rw-r--r-- | sound/songs/se_ki_gasyan.s | 76 |
4 files changed, 4 insertions, 77 deletions
diff --git a/ld_script.txt b/ld_script.txt index 138590628..d537dceac 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -608,7 +608,7 @@ SECTIONS { sound/songs/se_ru_gasyan.o(.rodata); sound/songs/se_ru_bari.o(.rodata); sound/songs/se_ru_hyuu.o(.rodata); - sound/songs/se_ki_gasyan.o(.rodata); + sound/songs/midi/se_ki_gasyan.o(.rodata); sound/songs/se_tk_warpin.o(.rodata); sound/songs/se_tk_warpout.o(.rodata); sound/songs/se_tu_saa.o(.rodata); @@ -927,5 +927,8 @@ $(MID_SUBDIR)/se_kaidan.s: %.s: %.mid $(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_ki_gasyan.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_ki_gasyan.mid b/sound/songs/midi/se_ki_gasyan.mid Binary files differnew file mode 100644 index 000000000..8a57132d9 --- /dev/null +++ b/sound/songs/midi/se_ki_gasyan.mid diff --git a/sound/songs/se_ki_gasyan.s b/sound/songs/se_ki_gasyan.s deleted file mode 100644 index 11bcfbf45..000000000 --- a/sound/songs/se_ki_gasyan.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "MPlayDef.s" - - .equ se_ki_gasyan_grp, voicegroup128 - .equ se_ki_gasyan_pri, 4 - .equ se_ki_gasyan_rev, reverb_set+50 - .equ se_ki_gasyan_mvl, 127 - .equ se_ki_gasyan_key, 0 - .equ se_ki_gasyan_tbs, 1 - .equ se_ki_gasyan_exg, 0 - .equ se_ki_gasyan_cmp, 1 - - .section .rodata - .global se_ki_gasyan - .align 2 - -@********************** Track 1 **********************@ - -se_ki_gasyan_1: - .byte KEYSH , se_ki_gasyan_key+0 - .byte TEMPO , 150*se_ki_gasyan_tbs/2 - .byte VOICE , 8 - .byte VOL , 100*se_ki_gasyan_mvl/mxv - .byte BEND , c_v+0 - .byte N01 , Cn3 , v127 - .byte W02 - .byte N02 , Gn2 - .byte W04 - .byte N17 , Cn3 - .byte W06 - .byte VOL , 98*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 91*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 81*se_ki_gasyan_mvl/mxv - .byte W02 - .byte 75*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 60*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 42*se_ki_gasyan_mvl/mxv - .byte W01 - .byte 25*se_ki_gasyan_mvl/mxv - .byte W02 - .byte 10*se_ki_gasyan_mvl/mxv - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_ki_gasyan_2: - .byte VOL , 100*se_ki_gasyan_mvl/mxv - .byte KEYSH , se_ki_gasyan_key+0 - .byte VOICE , 4 - .byte N01 , Cn3 , v064 - .byte W02 - .byte N02 - .byte W04 - .byte N02 - .byte W18 - .byte FINE - -@******************************************************@ - .align 2 - -se_ki_gasyan: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_ki_gasyan_pri @ Priority - .byte se_ki_gasyan_rev @ Reverb. - - .word se_ki_gasyan_grp - - .word se_ki_gasyan_1 - .word se_ki_gasyan_2 - - .end |