diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_tamago.mid | bin | 0 -> 271 bytes | |||
| -rw-r--r-- | sound/songs/se_tamago.s | 111 |
4 files changed, 4 insertions, 112 deletions
diff --git a/ld_script.txt b/ld_script.txt index 8a75381dd..cfe0fba54 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -747,7 +747,7 @@ SECTIONS { sound/songs/midi/se_pn_on.o(.rodata); sound/songs/midi/se_pn_off.o(.rodata); sound/songs/midi/se_z_search.o(.rodata); - sound/songs/se_tamago.o(.rodata); + sound/songs/midi/se_tamago.o(.rodata); sound/songs/se_tb_start.o(.rodata); sound/songs/se_tb_kon.o(.rodata); sound/songs/se_tb_kara.o(.rodata); @@ -1104,5 +1104,8 @@ $(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid $(MID_SUBDIR)/se_tama.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 +$(MID_SUBDIR)/se_tamago.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_tamago.mid Binary files differnew file mode 100644 index 000000000..67d3959eb --- /dev/null +++ b/sound/songs/midi/se_tamago.mid diff --git a/sound/songs/se_tamago.s b/sound/songs/se_tamago.s deleted file mode 100644 index dfd2a51fb..000000000 --- a/sound/songs/se_tamago.s +++ /dev/null @@ -1,111 +0,0 @@ - .include "MPlayDef.s" - - .equ se_tamago_grp, voicegroup128 - .equ se_tamago_pri, 5 - .equ se_tamago_rev, reverb_set+50 - .equ se_tamago_mvl, 127 - .equ se_tamago_key, 0 - .equ se_tamago_tbs, 1 - .equ se_tamago_exg, 0 - .equ se_tamago_cmp, 1 - - .section .rodata - .global se_tamago - .align 2 - -@********************** Track 1 **********************@ - -se_tamago_1: - .byte KEYSH , se_tamago_key+0 - .byte TEMPO , 150*se_tamago_tbs/2 - .byte VOICE , 21 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 120*se_tamago_mvl/mxv - .byte BEND , c_v+1 - .byte N01 , Bn5 , v127 - .byte W01 - .byte Cn5 , v100 - .byte W01 - .byte VOICE , 18 - .byte N01 , Cn4 , v127 - .byte W02 - .byte VOICE , 36 - .byte N19 , Cn6 , v040 - .byte W02 - .byte VOL , 63*se_tamago_mvl/mxv - .byte BEND , c_v+5 - .byte W01 - .byte VOL , 77*se_tamago_mvl/mxv - .byte BEND , c_v+13 - .byte W01 - .byte VOL , 91*se_tamago_mvl/mxv - .byte BEND , c_v+21 - .byte W01 - .byte VOL , 106*se_tamago_mvl/mxv - .byte BEND , c_v+33 - .byte W01 - .byte VOL , 120*se_tamago_mvl/mxv - .byte W05 - .byte 109*se_tamago_mvl/mxv - .byte W01 - .byte 102*se_tamago_mvl/mxv - .byte W02 - .byte 84*se_tamago_mvl/mxv - .byte W01 - .byte 68*se_tamago_mvl/mxv - .byte W01 - .byte 56*se_tamago_mvl/mxv - .byte W01 - .byte 24*se_tamago_mvl/mxv - .byte W01 - .byte 10*se_tamago_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_tamago_2: - .byte KEYSH , se_tamago_key+0 - .byte VOL , 120*se_tamago_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte W07 - .byte VOICE , 46 - .byte N01 , Cn6 , v100 - .byte W02 - .byte BEND , c_v+4 - .byte N01 , Gn5 , v088 - .byte W03 - .byte BEND , c_v+8 - .byte N01 , Cn6 , v072 - .byte W02 - .byte BEND , c_v+16 - .byte N01 , Gn5 , v056 - .byte W02 - .byte BEND , c_v+23 - .byte N01 , Cn6 , v040 - .byte W03 - .byte BEND , c_v+33 - .byte N01 , Gn5 , v028 - .byte W02 - .byte BEND , c_v+53 - .byte N01 , Cn6 , v012 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_tamago: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_tamago_pri @ Priority - .byte se_tamago_rev @ Reverb. - - .word se_tamago_grp - - .word se_tamago_1 - .word se_tamago_2 - - .end |