diff --git a/ld_script.txt b/ld_script.txt index 3f4a1714d..ffb7c2226 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -684,7 +684,7 @@ SECTIONS { sound/songs/se_tu_saa.o(.rodata); sound/songs/midi/se_hi_turun.o(.rodata); sound/songs/midi/se_track_move.o(.rodata); - sound/songs/se_track_stop.o(.rodata); + sound/songs/midi/se_track_stop.o(.rodata); sound/songs/midi/se_track_haiki.o(.rodata); sound/songs/midi/se_track_door.o(.rodata); sound/songs/midi/se_moter.o(.rodata); diff --git a/songs.mk b/songs.mk index 7122188ef..f2a6f44e2 100644 --- a/songs.mk +++ b/songs.mk @@ -1176,5 +1176,8 @@ $(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid $(MID_SUBDIR)/se_track_move.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 +$(MID_SUBDIR)/se_track_stop.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_track_stop.mid b/sound/songs/midi/se_track_stop.mid new file mode 100644 index 000000000..509b2dd8e Binary files /dev/null and b/sound/songs/midi/se_track_stop.mid differ diff --git a/sound/songs/se_track_stop.s b/sound/songs/se_track_stop.s deleted file mode 100644 index ef0aefc55..000000000 --- a/sound/songs/se_track_stop.s +++ /dev/null @@ -1,123 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_stop_grp, voicegroup128 - .equ se_track_stop_pri, 4 - .equ se_track_stop_rev, reverb_set+50 - .equ se_track_stop_mvl, 127 - .equ se_track_stop_key, 0 - .equ se_track_stop_tbs, 1 - .equ se_track_stop_exg, 0 - .equ se_track_stop_cmp, 1 - - .section .rodata - .global se_track_stop - .align 2 - -@********************** Track 1 **********************@ - -se_track_stop_1: - .byte KEYSH , se_track_stop_key+0 - .byte TEMPO , 150*se_track_stop_tbs/2 - .byte VOICE , 10 - .byte VOL , 127*se_track_stop_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Cs3 , v127 - .byte W09 - .byte BEND , c_v-9 - .byte W09 - .byte c_v-18 - .byte W06 - .byte W09 - .byte c_v-26 - .byte W09 - .byte c_v-34 - .byte W06 - .byte W06 - .byte c_v-43 - .byte W05 - .byte VOL , 123*se_track_stop_mvl/mxv - .byte W04 - .byte BEND , c_v-54 - .byte W02 - .byte VOL , 117*se_track_stop_mvl/mxv - .byte W06 - .byte 110*se_track_stop_mvl/mxv - .byte W01 - .byte BEND , c_v-64 - .byte W08 - .byte VOL , 101*se_track_stop_mvl/mxv - .byte W06 - .byte 89*se_track_stop_mvl/mxv - .byte W09 - .byte 77*se_track_stop_mvl/mxv - .byte W01 - .byte W05 - .byte 60*se_track_stop_mvl/mxv - .byte W09 - .byte 48*se_track_stop_mvl/mxv - .byte W06 - .byte 36*se_track_stop_mvl/mxv - .byte W04 - .byte W03 - .byte 23*se_track_stop_mvl/mxv - .byte W06 - .byte 8*se_track_stop_mvl/mxv - .byte W09 - .byte 0*se_track_stop_mvl/mxv - .byte W01 - .byte EOT - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_track_stop_2: - .byte KEYSH , se_track_stop_key+0 - .byte VOICE , 13 - .byte VOL , 90*se_track_stop_mvl/mxv - .byte W06 - .byte N09 , Gs6 , v024 - .byte W18 - .byte W05 - .byte N15 - .byte W19 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@********************** Track 3 **********************@ - -se_track_stop_3: - .byte KEYSH , se_track_stop_key+0 - .byte VOICE , 12 - .byte VOL , 90*se_track_stop_mvl/mxv - .byte W06 - .byte N09 , An6 , v024 - .byte W18 - .byte W05 - .byte N15 - .byte W19 - .byte W24 - .byte W24 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_stop: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_stop_pri @ Priority - .byte se_track_stop_rev @ Reverb. - - .word se_track_stop_grp - - .word se_track_stop_1 - .word se_track_stop_2 - .word se_track_stop_3 - - .end