diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 18:00:58 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 18:00:58 -0500 |
| commit | 25d4702ac4b420c288b209eb4f8ff3c9c1143b8d (patch) | |
| tree | 1d6e7bfa50ee6686aae314fd23982015e70555cc | |
| parent | a00079e63b31815dc86cc31120f5c0b19dcd2f66 (diff) | |
Match se_t_ame.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_t_ame.mid | bin | 0 -> 118 bytes | |||
| -rw-r--r-- | sound/songs/se_t_ame.s | 65 |
4 files changed, 4 insertions, 66 deletions
diff --git a/ld_script.txt b/ld_script.txt index e79826fab..f9d8210a6 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -696,7 +696,7 @@ SECTIONS { sound/songs/se_toy_dango.o(.rodata); sound/songs/midi/se_doku.o(.rodata); sound/songs/midi/se_esuka.o(.rodata); - sound/songs/se_t_ame.o(.rodata); + sound/songs/midi/se_t_ame.o(.rodata); sound/songs/se_t_ame_e.o(.rodata); sound/songs/se_t_ooame.o(.rodata); sound/songs/se_t_ooame_e.o(.rodata); @@ -1077,5 +1077,8 @@ $(MID_SUBDIR)/se_select.s: %.s: %.mid $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_t_ame.mid Binary files differnew file mode 100644 index 000000000..9e15434cd --- /dev/null +++ b/sound/songs/midi/se_t_ame.mid diff --git a/sound/songs/se_t_ame.s b/sound/songs/se_t_ame.s deleted file mode 100644 index 78db57968..000000000 --- a/sound/songs/se_t_ame.s +++ /dev/null @@ -1,65 +0,0 @@ - .include "MPlayDef.s" - - .equ se_t_ame_grp, voicegroup128 - .equ se_t_ame_pri, 2 - .equ se_t_ame_rev, reverb_set+50 - .equ se_t_ame_mvl, 127 - .equ se_t_ame_key, 0 - .equ se_t_ame_tbs, 1 - .equ se_t_ame_exg, 0 - .equ se_t_ame_cmp, 1 - - .section .rodata - .global se_t_ame - .align 2 - -@********************** Track 1 **********************@ - -se_t_ame_1: - .byte KEYSH , se_t_ame_key+0 - .byte TEMPO , 220*se_t_ame_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 15*se_t_ame_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v060 - .byte W03 - .byte VOL , 27*se_t_ame_mvl/mxv - .byte W03 - .byte 39*se_t_ame_mvl/mxv - .byte W03 - .byte 44*se_t_ame_mvl/mxv - .byte W03 - .byte 52*se_t_ame_mvl/mxv - .byte W03 - .byte 59*se_t_ame_mvl/mxv - .byte W03 - .byte 68*se_t_ame_mvl/mxv - .byte W03 - .byte 80*se_t_ame_mvl/mxv - .byte W03 -se_t_ame_1_B1: - .byte N60 , Gn3 , v060 - .byte W24 - .byte W24 - .byte W12 - .byte GOTO - .word se_t_ame_1_B1 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_t_ame: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_t_ame_pri @ Priority - .byte se_t_ame_rev @ Reverb. - - .word se_t_ame_grp - - .word se_t_ame_1 - - .end |