diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_exp.mid | bin | 621 -> 621 bytes | |||
| -rw-r--r-- | sound/songs/midi/se_expmax.mid | bin | 0 -> 138 bytes | |||
| -rw-r--r-- | sound/songs/se_expmax.s | 76 |
5 files changed, 4 insertions, 77 deletions
diff --git a/ld_script.txt b/ld_script.txt index 4abc87db3..a2f9064cb 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -655,7 +655,7 @@ SECTIONS { sound/songs/se_t_kami2.o(.rodata); sound/songs/midi/se_elebeta.o(.rodata); sound/songs/se_hinsi.o(.rodata); - sound/songs/se_expmax.o(.rodata); + sound/songs/midi/se_expmax.o(.rodata); sound/songs/se_tamakoro.o(.rodata); sound/songs/se_tamakoro_e.o(.rodata); sound/songs/midi/se_basabasa.o(.rodata); @@ -864,5 +864,8 @@ $(MID_SUBDIR)/se_esuka.s: %.s: %.mid $(MID_SUBDIR)/se_exp.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 +$(MID_SUBDIR)/se_expmax.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_exp.mid b/sound/songs/midi/se_exp.mid Binary files differindex dc9f2fada..fa75616b5 100644 --- a/sound/songs/midi/se_exp.mid +++ b/sound/songs/midi/se_exp.mid diff --git a/sound/songs/midi/se_expmax.mid b/sound/songs/midi/se_expmax.mid Binary files differnew file mode 100644 index 000000000..8772e915e --- /dev/null +++ b/sound/songs/midi/se_expmax.mid diff --git a/sound/songs/se_expmax.s b/sound/songs/se_expmax.s deleted file mode 100644 index a3a8478b2..000000000 --- a/sound/songs/se_expmax.s +++ /dev/null @@ -1,76 +0,0 @@ - .include "MPlayDef.s" - - .equ se_expmax_grp, voicegroup128 - .equ se_expmax_pri, 5 - .equ se_expmax_rev, reverb_set+50 - .equ se_expmax_mvl, 127 - .equ se_expmax_key, 0 - .equ se_expmax_tbs, 1 - .equ se_expmax_exg, 0 - .equ se_expmax_cmp, 1 - - .section .rodata - .global se_expmax - .align 2 - -@********************** Track 1 **********************@ - -se_expmax_1: - .byte KEYSH , se_expmax_key+0 - .byte TEMPO , 150*se_expmax_tbs/2 - .byte VOICE , 46 - .byte VOL , 94*se_expmax_mvl/mxv - .byte BENDR , 2 - .byte LFOS , 40 - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , An5 , v112 - .byte W01 - .byte N15 , En6 , v104 - .byte W02 - .byte W01 - .byte MOD , 5 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W01 - .byte 0 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_expmax_2: - .byte KEYSH , se_expmax_key+0 - .byte VOICE , 53 - .byte BENDR , 2 - .byte VOL , 43*se_expmax_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+15 - .byte N06 , An4 , v108 - .byte W01 - .byte N12 , Cs6 , v104 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_expmax: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_expmax_pri @ Priority - .byte se_expmax_rev @ Reverb. - - .word se_expmax_grp - - .word se_expmax_1 - .word se_expmax_2 - - .end |