From 6a76feddbf0cba1477016be85a0ca86ba5c77e25 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Wed, 26 Sep 2018 18:44:24 -0400
Subject: [PATCH] Match mus_fanfa4.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 +
 sound/songs/midi/mus_fanfa4.mid | Bin 0 -> 739 bytes
 sound/songs/mus_fanfa4.s        | 283 --------------------------------
 4 files changed, 4 insertions(+), 284 deletions(-)
 create mode 100644 sound/songs/midi/mus_fanfa4.mid
 delete mode 100644 sound/songs/mus_fanfa4.s

diff --git a/ld_script.txt b/ld_script.txt
index 7f5db384b..81cdb8921 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -853,7 +853,7 @@ SECTIONS {
         sound/songs/midi/mus_fanfa1.o(.rodata);
         sound/songs/mus_me_asa.o(.rodata);
         sound/songs/mus_me_bachi.o(.rodata);
-        sound/songs/mus_fanfa4.o(.rodata);
+        sound/songs/midi/mus_fanfa4.o(.rodata);
         sound/songs/mus_fanfa5.o(.rodata);
         sound/songs/mus_me_waza.o(.rodata);
         sound/songs/midi/mus_bijyutu.o(.rodata);
diff --git a/songs.mk b/songs.mk
index db3f3d4e2..9a9ed9c28 100644
--- a/songs.mk
+++ b/songs.mk
@@ -150,6 +150,9 @@ $(MID_SUBDIR)/mus_event0.s: %.s: %.mid
 $(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid
 	$(MID) $< $@ -G012 -R$(STD_REVERB) -P5
 
+$(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid
+	$(MID) $< $@ -G012 -R$(STD_REVERB) -P5
+
 $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
 	$(MID) $< $@ -G017 -R$(STD_REVERB)
 
diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_fanfa4.mid
new file mode 100644
index 0000000000000000000000000000000000000000..78671f89c49a1f9e2e62e70397e1fb4f9246649f
GIT binary patch
literal 739
zcmZXPJ4*vW6opU5WcC^s*)kwnZJ|-3wM|4q2rQ8?t`Mv(f;M6ymeC}o;4A+l&)(+`
z@E651vW9Wf?Adefocqnx<JK7fjSM^#>haYD-703yY*rP-PZYDGrR?`TW;;lZocpgO
z47^k1H}GJL3^F-s8(@%uJVZvfBPiyYnVS2Ck#>Xgv>FrGzSqckHP743c`IJBYu6>d
zl`yo#eLTi38M1L3149z&HUHIup0wolg!8n<t-$tOVzSF2HvRWKj7WUiz6tKOAyiFO
z3tGI9yCUa*x<$YBd%iGo87w>dul<h(#@xRySQD%-+iyO=b1jrHZ`Y{-W4`XW66#I`
zin(T{=Dr$Ar^<O+D`8;!E}4D1>mU8|7?U*p5-*idCTw@vn2`Qb4t2K-#auH}bAJ#@
z_ki=XmczjIT{`=AmqS1Ize<?qo8Sfdk&!7Iy$G0+*smGg<2#vaW@_#ajr0yVPitfX
L+joh{E=&9Yzto{a

literal 0
HcmV?d00001

diff --git a/sound/songs/mus_fanfa4.s b/sound/songs/mus_fanfa4.s
deleted file mode 100644
index 57723229f..000000000
--- a/sound/songs/mus_fanfa4.s
+++ /dev/null
@@ -1,283 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_fanfa4_grp, voicegroup012
-	.equ	mus_fanfa4_pri, 5
-	.equ	mus_fanfa4_rev, reverb_set+50
-	.equ	mus_fanfa4_mvl, 127
-	.equ	mus_fanfa4_key, 0
-	.equ	mus_fanfa4_tbs, 1
-	.equ	mus_fanfa4_exg, 0
-	.equ	mus_fanfa4_cmp, 1
-
-	.section .rodata
-	.global	mus_fanfa4
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_fanfa4_1:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte	TEMPO , 190*mus_fanfa4_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 90*mus_fanfa4_mvl/mxv
-	.byte		PAN   , c_v-24
-	.byte		N16   , Gs4 , v080
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Ds4 
-	.byte	W08
-	.byte		        Gs4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		N08   , As4 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Gs4 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 82*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        72*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        41*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        14*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_fanfa4_2:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 46
-	.byte		VOL   , 90*mus_fanfa4_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		N16   , Cn5 , v104
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N08   , Cs5 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Cn5 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 82*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        72*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        41*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        14*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_fanfa4_3:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 58
-	.byte		VOL   , 90*mus_fanfa4_mvl/mxv
-	.byte		N16   , Gs1 , v120
-	.byte	W24
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N06   
-	.byte	W08
-	.byte		N08   , Fs1 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		        Gn1 
-	.byte	W16
-	.byte		N48   , Gs1 
-	.byte	W24
-	.byte		VOL   , 82*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        72*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        41*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        14*mus_fanfa4_mvl/mxv
-	.byte	W54
-	.byte	W01
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_fanfa4_4:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 82
-	.byte		VOL   , 90*mus_fanfa4_mvl/mxv
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v-48
-	.byte		N16   , Cn4 , v036
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Gs3 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		N08   , As3 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Gs3 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 82*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        72*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        41*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        14*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  5 **********************@
-
-mus_fanfa4_5:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 83
-	.byte		VOL   , 90*mus_fanfa4_mvl/mxv
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+48
-	.byte		N16   , Gs3 , v036
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Ds3 
-	.byte	W08
-	.byte		        Gs3 
-	.byte	W08
-	.byte		        Ds3 
-	.byte	W08
-	.byte		N08   , Fs3 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Ds3 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 82*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        72*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        41*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        14*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W48
-	.byte	FINE
-
-@********************** Track  6 **********************@
-
-mus_fanfa4_6:
-	.byte	KEYSH , mus_fanfa4_key+0
-	.byte	W12
-	.byte		VOICE , 46
-	.byte		PAN   , c_v+24
-	.byte		VOL   , 90*mus_fanfa4_mvl/mxv
-	.byte		N16   , Ds4 , v080
-	.byte	W08
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		        0
-	.byte	W08
-	.byte		N06   , Cn4 
-	.byte	W08
-	.byte		        Ds4 
-	.byte	W08
-	.byte		        Cn4 
-	.byte	W08
-	.byte		N08   , Fs4 
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N08   
-	.byte	W16
-	.byte		N48   , Ds4 
-	.byte	W16
-	.byte		MOD   , 5
-	.byte	W08
-	.byte		VOL   , 82*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        72*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		        41*mus_fanfa4_mvl/mxv
-	.byte	W05
-	.byte		        14*mus_fanfa4_mvl/mxv
-	.byte	W07
-	.byte		MOD   , 0
-	.byte	W48
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_fanfa4:
-	.byte	6	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_fanfa4_pri	@ Priority
-	.byte	mus_fanfa4_rev	@ Reverb.
-
-	.word	mus_fanfa4_grp
-
-	.word	mus_fanfa4_1
-	.word	mus_fanfa4_2
-	.word	mus_fanfa4_3
-	.word	mus_fanfa4_4
-	.word	mus_fanfa4_5
-	.word	mus_fanfa4_6
-
-	.end