From f632869c025b2fb841f4bc53dda69aad3a43e9f1 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 22:39:17 -0400 Subject: [PATCH] Match mus_me_tore_eye.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/songs/midi/mus_me_tore_eye.mid | Bin 0 -> 639 bytes sound/songs/mus_me_tore_eye.s | 215 --------------------------- 4 files changed, 4 insertions(+), 216 deletions(-) create mode 100644 sound/songs/midi/mus_me_tore_eye.mid delete mode 100644 sound/songs/mus_me_tore_eye.s diff --git a/ld_script.txt b/ld_script.txt index 86d0eddc9..13dfc0584 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -943,7 +943,7 @@ SECTIONS { sound/songs/midi/mus_b_frontier.o(.rodata); sound/songs/midi/mus_b_arena.o(.rodata); sound/songs/midi/mus_me_pointget.o(.rodata); - sound/songs/mus_me_tore_eye.o(.rodata); + sound/songs/midi/mus_me_tore_eye.o(.rodata); sound/songs/mus_pyramid.o(.rodata); sound/songs/mus_pyramid_top.o(.rodata); sound/songs/midi/mus_b_palace.o(.rodata); diff --git a/songs.mk b/songs.mk index f7b27ac64..7327f0bf8 100644 --- a/songs.mk +++ b/songs.mk @@ -276,6 +276,9 @@ $(MID_SUBDIR)/mus_me_symbolget.s: %.s: %.mid $(MID_SUBDIR)/mus_me_tama.s: %.s: %.mid $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5 +$(MID_SUBDIR)/mus_me_tore_eye.s: %.s: %.mid + $(MID) $< $@ -G105 -R$(STD_REVERB) -V090 -P5 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/songs/midi/mus_me_tore_eye.mid b/sound/songs/midi/mus_me_tore_eye.mid new file mode 100644 index 0000000000000000000000000000000000000000..f2682bf320dc7062acfb3881a1164d807f7ba765 GIT binary patch literal 639 zcmZwE%}T>S6b0ZjH-pv^p%e?*D1sXof<;SEkP<`%6>Xy;r7DOFMbMQ?U9`5@xNDL= zh*clJzc=wg>WN0}!bRrGNiH*UXLb(G4S*3SKF-d;)dkZG1~sk4$zb4HV|V8^qq3Y# zqEHOxk(OTKc^vnJIZW6XZ6aH=yLBV2I?z3$NA#E;(-WgxC(zw9qgrRM(hO!{mad_O zHdxnSeWR3`OU(bRd4-of^ts^ovK+G>Mm;-RH*&iUgsXIwdeoz3TEjgD0QxHP^G;8bZ*)4*=_@tV?G0XiJQNl&mBD2GYs`IhUWC%fiXCklX>S727Tu!T zbemR;Zdafq->9|^E81n={jC#bVV1~0)%=ghFQw)ZhnjEVt%^tX{LdBy*(N^V*)gZ< zaQe7HE3`_h)Hk~0L&t|kbq-;r8O*{gagEk!oprp!xL!)lB@S(41Mk37a_-mpo@aF6 kLHBshK^fB9FX~_)=q;`2U@39-TX#(dF0(r))ZvYO0!+h_1^@s6 literal 0 HcmV?d00001 diff --git a/sound/songs/mus_me_tore_eye.s b/sound/songs/mus_me_tore_eye.s deleted file mode 100644 index bcdb74aed..000000000 --- a/sound/songs/mus_me_tore_eye.s +++ /dev/null @@ -1,215 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_me_tore_eye_grp, voicegroup105 - .equ mus_me_tore_eye_pri, 5 - .equ mus_me_tore_eye_rev, reverb_set+50 - .equ mus_me_tore_eye_mvl, 127 - .equ mus_me_tore_eye_key, 0 - .equ mus_me_tore_eye_tbs, 1 - .equ mus_me_tore_eye_exg, 0 - .equ mus_me_tore_eye_cmp, 1 - - .section .rodata - .global mus_me_tore_eye - .align 2 - -@********************** Track 1 **********************@ - -mus_me_tore_eye_1: - .byte KEYSH , mus_me_tore_eye_key+0 - .byte TEMPO , 96*mus_me_tore_eye_tbs/2 - .byte VOICE , 13 - .byte LFOS , 44 - .byte BENDR , 12 - .byte VOL , 90*mus_me_tore_eye_mvl/mxv - .byte PAN , c_v-16 - .byte W12 - .byte N02 , Fs5 , v100 - .byte W02 - .byte Gn5 - .byte W02 - .byte Gs5 - .byte W02 - .byte N04 , An5 - .byte W06 - .byte W02 - .byte N01 , Dn6 - .byte W04 - .byte N04 , An5 - .byte W04 - .byte N02 , Dn6 - .byte W04 - .byte En6 - .byte W04 - .byte N04 , Fs6 - .byte W04 - .byte Fs6 , v052 - .byte W02 - .byte W02 - .byte Fs6 , v016 - .byte W22 - .byte FINE - -@********************** Track 2 **********************@ - -mus_me_tore_eye_2: - .byte KEYSH , mus_me_tore_eye_key+0 - .byte VOICE , 82 - .byte BENDR , 12 - .byte LFOS , 44 - .byte BENDR , 12 - .byte LFOS , 44 - .byte PAN , c_v+0 - .byte VOL , 45*mus_me_tore_eye_mvl/mxv - .byte W12 - .byte N02 , An3 , v100 - .byte W02 - .byte Fs3 - .byte W02 - .byte En3 - .byte W02 - .byte Dn3 - .byte W06 - .byte W02 - .byte N01 , An2 - .byte W04 - .byte N02 , Fs2 - .byte W04 - .byte Dn2 - .byte W02 - .byte MOD , 8 - .byte W02 - .byte N02 - .byte W04 - .byte Dn2 , v096 - .byte W04 - .byte Dn2 , v032 - .byte W02 - .byte W24 - .byte MOD , 1 - .byte FINE - -@********************** Track 3 **********************@ - -mus_me_tore_eye_3: - .byte KEYSH , mus_me_tore_eye_key+0 - .byte VOICE , 81 - .byte LFOS , 51 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 34*mus_me_tore_eye_mvl/mxv - .byte MOD , 4 - .byte PAN , c_v-62 - .byte W12 - .byte N02 , Cs4 , v100 - .byte W02 - .byte Dn4 - .byte W02 - .byte Ds4 - .byte W02 - .byte N04 , Gn4 - .byte W06 - .byte W02 - .byte N01 , An4 - .byte W04 - .byte N04 , Fs4 - .byte W04 - .byte N02 , Dn4 - .byte W04 - .byte Fs4 - .byte W04 - .byte N04 , An4 , v096 - .byte W04 - .byte An4 , v052 - .byte W02 - .byte W02 - .byte An4 , v016 - .byte W22 - .byte FINE - -@********************** Track 4 **********************@ - -mus_me_tore_eye_4: - .byte KEYSH , mus_me_tore_eye_key+0 - .byte VOICE , 80 - .byte LFOS , 44 - .byte XCMD , xIECV , 18 - .byte xIECV , 16 - .byte BENDR , 12 - .byte VOL , 34*mus_me_tore_eye_mvl/mxv - .byte MOD , 2 - .byte PAN , c_v+63 - .byte BEND , c_v+0 - .byte W12 - .byte N02 , Fs4 , v100 - .byte W02 - .byte Gn4 - .byte W02 - .byte Gs4 - .byte W02 - .byte N04 , An4 - .byte W06 - .byte W02 - .byte N01 , Dn5 - .byte W04 - .byte N04 , An4 - .byte W04 - .byte N02 , Dn5 - .byte W04 - .byte En5 - .byte W04 - .byte N04 , Fs5 - .byte W04 - .byte Fs5 , v052 - .byte W02 - .byte W02 - .byte Fs5 , v016 - .byte W22 - .byte FINE - -@********************** Track 5 **********************@ - -mus_me_tore_eye_5: - .byte KEYSH , mus_me_tore_eye_key+0 - .byte VOICE , 0 - .byte PAN , c_v+0 - .byte VOL , 86*mus_me_tore_eye_mvl/mxv - .byte W12 - .byte W06 - .byte N04 , En3 , v100 - .byte W06 - .byte W02 - .byte N02 , Dn3 - .byte W04 - .byte N04 , Bn4 , v048 - .byte W04 - .byte Gs2 , v060 - .byte W04 - .byte Gs2 , v040 - .byte W04 - .byte Fs2 , v068 - .byte W04 - .byte N02 , Fs2 , v044 - .byte W02 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -mus_me_tore_eye: - .byte 5 @ NumTrks - .byte 0 @ NumBlks - .byte mus_me_tore_eye_pri @ Priority - .byte mus_me_tore_eye_rev @ Reverb. - - .word mus_me_tore_eye_grp - - .word mus_me_tore_eye_1 - .word mus_me_tore_eye_2 - .word mus_me_tore_eye_3 - .word mus_me_tore_eye_4 - .word mus_me_tore_eye_5 - - .end