From 5a64d81581f0f06e0efcd5cbd267571c6fbf340e Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Sun, 24 Mar 2019 16:13:51 -0400 Subject: [PATCH] Match se_toreeye.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/se_toreeye.mid | Bin 0 -> 472 bytes sound/songs/se_toreeye.s | 146 -------------------------------- 4 files changed, 4 insertions(+), 147 deletions(-) create mode 100644 sound/songs/midi/se_toreeye.mid delete mode 100644 sound/songs/se_toreeye.s diff --git a/ld_script.txt b/ld_script.txt index 21eb77a98d..8408ae5052 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -897,7 +897,7 @@ SECTIONS { sound/songs/midi/se_rg_deomov.o(.rodata); sound/songs/midi/se_rg_excellent.o(.rodata); sound/songs/midi/se_rg_nawamiss.o(.rodata); - sound/songs/se_toreeye.o(.rodata); + sound/songs/midi/se_toreeye.o(.rodata); sound/songs/se_toreoff.o(.rodata); sound/songs/midi/se_hantei1.o(.rodata); sound/songs/midi/se_hantei2.o(.rodata); diff --git a/songs.mk b/songs.mk index e512d068e2..dcbdc417cb 100644 --- a/songs.mk +++ b/songs.mk @@ -1131,5 +1131,8 @@ $(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid $(MID_SUBDIR)/se_tk_warpout.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 +$(MID_SUBDIR)/se_toreeye.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V120 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_toreeye.mid b/sound/songs/midi/se_toreeye.mid new file mode 100644 index 0000000000000000000000000000000000000000..e25a9ac749066001dfae3501c068bf2a27e9baf3 GIT binary patch literal 472 zcmb7}+%?)-ECr(HFsJ zVe^J}=ggfullgiDlo4#)$$Y!fUyF2663eZU&g}AeK|0{oI&rCU?DT2Zs6;qJ4*p1X zJ{$tAf!5D|sCtMLbi+OSX6`p<{QvZOXTNiul4$l`m2NY88`&L0#KMWVF(&p#viBff xYF$F&SYNb=SmW<~#PEq@=QD3D=ZuGBTw#ZD1x@`5JCu9nGJNLut$q!^!aM%C< literal 0 HcmV?d00001 diff --git a/sound/songs/se_toreeye.s b/sound/songs/se_toreeye.s deleted file mode 100644 index 685e378780..0000000000 --- a/sound/songs/se_toreeye.s +++ /dev/null @@ -1,146 +0,0 @@ - .include "MPlayDef.s" - - .equ se_toreeye_grp, voicegroup129 - .equ se_toreeye_pri, 5 - .equ se_toreeye_rev, reverb_set+50 - .equ se_toreeye_mvl, 127 - .equ se_toreeye_key, 0 - .equ se_toreeye_tbs, 1 - .equ se_toreeye_exg, 0 - .equ se_toreeye_cmp, 1 - - .section .rodata - .global se_toreeye - .align 2 - -@********************** Track 1 **********************@ - -se_toreeye_1: - .byte KEYSH , se_toreeye_key+0 - .byte TEMPO , 136*se_toreeye_tbs/2 - .byte VOICE , 13 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 120*se_toreeye_mvl/mxv - .byte PAN , c_v-16 - .byte N01 , An5 , v064 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte Fs6 - .byte W02 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Fs6 - .byte W01 - .byte An5 - .byte W02 - .byte N01 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte Fs6 - .byte W02 - .byte An5 - .byte W01 - .byte Dn6 - .byte W01 - .byte An5 - .byte W01 - .byte Fs6 - .byte W01 - .byte An5 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_toreeye_2: - .byte KEYSH , se_toreeye_key+0 - .byte VOICE , 80 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 45*se_toreeye_mvl/mxv - .byte MOD , 2 - .byte PAN , c_v+63 - .byte BEND , c_v+2 - .byte N01 , Dn5 , v064 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v-62 - .byte N01 , Dn5 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , An5 - .byte W02 - .byte Dn5 - .byte W01 - .byte PAN , c_v-61 - .byte N01 , Fs5 - .byte W01 - .byte Dn5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , An5 - .byte W01 - .byte Dn5 - .byte W02 - .byte PAN , c_v-61 - .byte N01 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , Dn5 - .byte W01 - .byte Fs5 - .byte W01 - .byte PAN , c_v-61 - .byte N01 , An5 - .byte W02 - .byte Dn5 - .byte W01 - .byte PAN , c_v+63 - .byte N01 , Fs5 - .byte W01 - .byte Dn5 - .byte W01 - .byte PAN , c_v-61 - .byte N01 , An5 - .byte W01 - .byte Dn5 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_toreeye: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_toreeye_pri @ Priority - .byte se_toreeye_rev @ Reverb. - - .word se_toreeye_grp - - .word se_toreeye_1 - .word se_toreeye_2 - - .end