diff --git a/ld_script.txt b/ld_script.txt index 48dc3138f..4bdd50368 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -563,7 +563,7 @@ SECTIONS { song_data : ALIGN(4) { - sound/songs/mus_dummy.o(.rodata); + sound/songs/midi/mus_dummy.o(.rodata); sound/songs/se_kaifuku.o(.rodata); sound/songs/se_pc_login.o(.rodata); sound/songs/se_pc_off.o(.rodata); diff --git a/songs.mk b/songs.mk index d0cbf2d00..4acd2a835 100644 --- a/songs.mk +++ b/songs.mk @@ -135,6 +135,9 @@ $(MID_SUBDIR)/mus_dooro_x4.s: %.s: %.mid $(MID_SUBDIR)/mus_dooro1.s: %.s: %.mid $(MID) $< $@ -G011 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_dummy.s: %.s: %.mid + $(MID) $< $@ -R40 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_dummy.mid b/sound/songs/midi/mus_dummy.mid new file mode 100644 index 000000000..829f3a1e2 Binary files /dev/null and b/sound/songs/midi/mus_dummy.mid differ diff --git a/sound/songs/mus_dummy.s b/sound/songs/mus_dummy.s deleted file mode 100644 index a3dfa9865..000000000 --- a/sound/songs/mus_dummy.s +++ /dev/null @@ -1,28 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_dummy_grp, voicegroup000 - .equ mus_dummy_pri, 0 - .equ mus_dummy_rev, reverb_set+40 - .equ mus_dummy_mvl, 127 - .equ mus_dummy_key, 0 - .equ mus_dummy_tbs, 1 - .equ mus_dummy_exg, 0 - .equ mus_dummy_cmp, 1 - - .section .rodata - .global mus_dummy - .align 2 - -@******************************************************@ - .align 2 - -mus_dummy: - .byte 0 @ NumTrks - .byte 0 @ NumBlks - .byte mus_dummy_pri @ Priority - .byte mus_dummy_rev @ Reverb. - - .word mus_dummy_grp - - - .end