diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:02:24 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 15:02:24 -0500 |
| commit | 68cb780ac33a01b909fd6edf098f7bbb9beeb0f1 (patch) | |
| tree | 03569b2e978389b354f5ecd853026062b7d8b6dd | |
| parent | e7464b39a37637acfdcf92f7b5ec1c8bad673ac7 (diff) | |
Match se_moter.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_moter.mid | bin | 0 -> 87 bytes | |||
| -rw-r--r-- | sound/songs/se_moter.s | 49 |
4 files changed, 4 insertions, 50 deletions
diff --git a/ld_script.txt b/ld_script.txt index de01ac9b4..7209dd0e0 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -668,7 +668,7 @@ SECTIONS { sound/songs/se_track_stop.o(.rodata); sound/songs/se_track_haiki.o(.rodata); sound/songs/se_track_door.o(.rodata); - sound/songs/se_moter.o(.rodata); + sound/songs/midi/se_moter.o(.rodata); sound/songs/midi/se_card.o(.rodata); sound/songs/se_save.o(.rodata); sound/songs/midi/se_kon.o(.rodata); @@ -954,5 +954,8 @@ $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid $(MID_SUBDIR)/se_mizu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4 +$(MID_SUBDIR)/se_moter.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_moter.mid Binary files differnew file mode 100644 index 000000000..8203333e5 --- /dev/null +++ b/sound/songs/midi/se_moter.mid diff --git a/sound/songs/se_moter.s b/sound/songs/se_moter.s deleted file mode 100644 index 390835125..000000000 --- a/sound/songs/se_moter.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_moter_grp, voicegroup128 - .equ se_moter_pri, 4 - .equ se_moter_rev, reverb_set+50 - .equ se_moter_mvl, 127 - .equ se_moter_key, 0 - .equ se_moter_tbs, 1 - .equ se_moter_exg, 0 - .equ se_moter_cmp, 1 - - .section .rodata - .global se_moter - .align 2 - -@********************** Track 1 **********************@ - -se_moter_1: - .byte KEYSH , se_moter_key+0 -se_moter_1_B1: - .byte TEMPO , 150*se_moter_tbs/2 - .byte VOICE , 15 - .byte VOL , 90*se_moter_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte TIE , Gn2 , v100 - .byte W96 - .byte W96 - .byte W48 - .byte EOT - .byte GOTO - .word se_moter_1_B1 - .byte W48 - .byte FINE - -@******************************************************@ - .align 2 - -se_moter: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_moter_pri @ Priority - .byte se_moter_rev @ Reverb. - - .word se_moter_grp - - .word se_moter_1 - - .end |