diff --git a/ld_script.txt b/ld_script.txt index df10af6d7..612818861 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -617,7 +617,7 @@ SECTIONS { { sound/songs/midi/mus_dummy.o(.rodata); sound/songs/midi/se_kaifuku.o(.rodata); - sound/songs/se_pc_login.o(.rodata); + sound/songs/midi/se_pc_login.o(.rodata); sound/songs/se_pc_off.o(.rodata); sound/songs/se_pc_on.o(.rodata); sound/songs/se_select.o(.rodata); diff --git a/songs.mk b/songs.mk index 36cc84272..4ff4de9b5 100644 --- a/songs.mk +++ b/songs.mk @@ -978,5 +978,8 @@ $(MID_SUBDIR)/se_o.s: %.s: %.mid $(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 +$(MID_SUBDIR)/se_pc_login.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_pc_login.mid b/sound/songs/midi/se_pc_login.mid new file mode 100644 index 000000000..f46a52e7a Binary files /dev/null and b/sound/songs/midi/se_pc_login.mid differ diff --git a/sound/songs/se_pc_login.s b/sound/songs/se_pc_login.s deleted file mode 100644 index 19efbc0a1..000000000 --- a/sound/songs/se_pc_login.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_pc_login_grp, voicegroup127 - .equ se_pc_login_pri, 5 - .equ se_pc_login_rev, reverb_set+50 - .equ se_pc_login_mvl, 127 - .equ se_pc_login_key, 0 - .equ se_pc_login_tbs, 1 - .equ se_pc_login_exg, 0 - .equ se_pc_login_cmp, 1 - - .section .rodata - .global se_pc_login - .align 2 - -@********************** Track 1 **********************@ - -se_pc_login_1: - .byte KEYSH , se_pc_login_key+0 - .byte TEMPO , 144*se_pc_login_tbs/2 - .byte VOICE , 4 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 100*se_pc_login_mvl/mxv - .byte BEND , c_v-6 - .byte N08 , Cn4 , v112 - .byte W08 - .byte N04 , Cn4 , v028 - .byte W04 - .byte N08 , Cn4 , v112 - .byte W08 - .byte N04 , Cn4 , v024 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_pc_login: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_pc_login_pri @ Priority - .byte se_pc_login_rev @ Reverb. - - .word se_pc_login_grp - - .word se_pc_login_1 - - .end