From 41a30f56bdb5b4d5d83e0bd2feb577486181ed57 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 10 Oct 2018 15:07:53 -0400 Subject: [PATCH] Match se_curtain1.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/se_curtain1.mid | Bin 0 -> 418 bytes sound/songs/se_curtain1.s | 168 ------------------------------- 4 files changed, 4 insertions(+), 169 deletions(-) create mode 100644 sound/songs/midi/se_curtain1.mid delete mode 100644 sound/songs/se_curtain1.s diff --git a/ld_script.txt b/ld_script.txt index 626dd1d83..b2168ba9a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -832,7 +832,7 @@ SECTIONS { sound/songs/se_hantei1.o(.rodata); sound/songs/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); - sound/songs/se_curtain1.o(.rodata); + sound/songs/midi/se_curtain1.o(.rodata); sound/songs/se_ussoki.o(.rodata); sound/songs/midi/mus_tetsuji.o(.rodata); sound/songs/midi/mus_field13.o(.rodata); diff --git a/songs.mk b/songs.mk index 4b61b8511..179e641ec 100644 --- a/songs.mk +++ b/songs.mk @@ -834,5 +834,8 @@ $(MID_SUBDIR)/se_card.s: %.s: %.mid $(MID_SUBDIR)/se_curtain.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 +$(MID_SUBDIR)/se_curtain1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_curtain1.mid b/sound/songs/midi/se_curtain1.mid new file mode 100644 index 0000000000000000000000000000000000000000..0a40e158eddbf175ea02476e3389882d8ab22a2b GIT binary patch literal 418 zcmYk2!AiqG5QhKRT}&(y#8xPR5_<3yG>0lZ1iA+gJ+uc)&_a7Cv{1oI@zjg7=@T@? zC-4bcpFn*Q>5Ifkvf5mB`2PLppV{q%Ph$WFAShHj;mb4A8IqnNS+$YeOWS)7xEwyd zA-RTe{NVEv8xmM~GqE8{EIcq1R{l&f)4~U3TsK@d+%W!z;lOZUxM{d)^7Jsz(|lhN zNJq5YTxzG%Jd?DaZ&7qPxm0wye=huI+50RKvZP_no&7s+@ii{Tt*MGypt#Gm3mFfz ziU!OhUqvJ4iL0Usj<#v{w9tJQe81x3)We01^ONj6M#TaDoArPlEUZIKJCq4E!WH30 QK+9zatouV+_91waUsLE-mH+?% literal 0 HcmV?d00001 diff --git a/sound/songs/se_curtain1.s b/sound/songs/se_curtain1.s deleted file mode 100644 index 40e97ba13..000000000 --- a/sound/songs/se_curtain1.s +++ /dev/null @@ -1,168 +0,0 @@ - .include "MPlayDef.s" - - .equ se_curtain1_grp, voicegroup129 - .equ se_curtain1_pri, 5 - .equ se_curtain1_rev, reverb_set+50 - .equ se_curtain1_mvl, 127 - .equ se_curtain1_key, 0 - .equ se_curtain1_tbs, 1 - .equ se_curtain1_exg, 0 - .equ se_curtain1_cmp, 1 - - .section .rodata - .global se_curtain1 - .align 2 - -@********************** Track 1 **********************@ - -se_curtain1_1: - .byte VOL , 127*se_curtain1_mvl/mxv - .byte KEYSH , se_curtain1_key+0 - .byte TEMPO , 112*se_curtain1_tbs/2 - .byte VOICE , 38 - .byte MOD , 2 - .byte N04 , Gs1 , v120 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , Cn2 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , En2 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , Gs2 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , Cn3 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte 1 - .byte N04 , Ds3 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte 1 - .byte N04 , En3 , v096 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v032 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v+63 - .byte MOD , 1 - .byte N04 , En3 , v048 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v012 - .byte W02 - .byte MOD , 7 - .byte W03 - .byte PAN , c_v+63 - .byte MOD , 1 - .byte N04 , En3 , v032 - .byte W02 - .byte MOD , 7 - .byte W02 - .byte PAN , c_v-62 - .byte MOD , 1 - .byte N04 , En4 , v008 - .byte W03 - .byte MOD , 7 - .byte W02 - .byte 2 - .byte W03 - .byte TEMPO , 98*se_curtain1_tbs/2 - .byte PAN , c_v+0 - .byte VOL , 127*se_curtain1_mvl/mxv - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_curtain1_2: - .byte VOL , 127*se_curtain1_mvl/mxv - .byte KEYSH , se_curtain1_key+0 - .byte VOICE , 100 - .byte W12 - .byte W07 - .byte N04 , Cn4 , v112 - .byte W05 - .byte As4 - .byte W07 - .byte Gs5 , v064 - .byte W05 - .byte Ds6 , v048 - .byte W07 - .byte Gn6 , v032 - .byte W05 - .byte W12 - .byte PAN , c_v+0 - .byte VOL , 112*se_curtain1_mvl/mxv - .byte W12 - .byte FINE - -@********************** Track 3 **********************@ - -se_curtain1_3: - .byte KEYSH , se_curtain1_key+0 - .byte W12 - .byte W12 - .byte W12 - .byte W12 - .byte W12 - .byte VOICE , 125 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte MOD , 2 - .byte VOL , 86*se_curtain1_mvl/mxv - .byte BEND , c_v-57 - .byte N09 , Cn5 , v064 - .byte W01 - .byte BEND , c_v-45 - .byte W01 - .byte c_v-30 - .byte W01 - .byte c_v-18 - .byte W01 - .byte c_v-11 - .byte W02 - .byte c_v+0 - .byte W03 - .byte N01 , Gn5 , v096 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_curtain1: - .byte 3 @ NumTrks - .byte 0 @ NumBlks - .byte se_curtain1_pri @ Priority - .byte se_curtain1_rev @ Reverb. - - .word se_curtain1_grp - - .word se_curtain1_1 - .word se_curtain1_2 - .word se_curtain1_3 - - .end