From 8f78809f29f8ad39abec720e2ad91bd2fbed5510 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 2 Oct 2018 23:59:34 -0400
Subject: [PATCH] Match mus_rg_tvnoize.mid

---
 ld_script.txt                       |   2 +-
 songs.mk                            |   3 +
 sound/song_table.inc                |   2 +-
 sound/songs/midi/mus_rg_tvnoize.mid | Bin 0 -> 582 bytes
 sound/songs/mus_rg_tvnoize.s        | 173 ----------------------------
 5 files changed, 5 insertions(+), 175 deletions(-)
 create mode 100644 sound/songs/midi/mus_rg_tvnoize.mid
 delete mode 100644 sound/songs/mus_rg_tvnoize.s

diff --git a/ld_script.txt b/ld_script.txt
index d05d62e451..5f09d96f23 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1041,7 +1041,7 @@ SECTIONS {
         sound/songs/midi/mus_rg_deoeye.o(.rodata);
         sound/songs/midi/mus_rg_t_tower.o(.rodata);
         sound/songs/midi/mus_rg_slowmasara.o(.rodata);
-        sound/songs/mus_rg_tvnoize.o(.rodata);
+        sound/songs/midi/mus_rg_tvnoize.o(.rodata);
         sound/songs/ph_trap_blend.o(.rodata);
         sound/songs/ph_trap_held.o(.rodata);
         sound/songs/ph_trap_solo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 8ae97a6158..e354f0efc7 100644
--- a/songs.mk
+++ b/songs.mk
@@ -522,6 +522,9 @@ $(MID_SUBDIR)/mus_rg_title.s: %.s: %.mid
 $(MID_SUBDIR)/mus_rg_titlerog.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G181 -V075
 
+$(MID_SUBDIR)/mus_rg_tvnoize.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G186 -V059
+
 $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078
 
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 26c62b5c24..f26f69d4a5 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -562,7 +562,7 @@ gSongTable:: @ 86B49F0
 	song mus_rg_deoeye, 0, 0        @ Deoxys Appears
 	song mus_rg_t_tower, 0, 0       @ Trainer Tower (FRLG)
 	song mus_rg_slowmasara, 0, 0    @ Epilogue (FRLG)
-	song mus_rg_tvnoize, 0, 0       @ Teachy TV
+	song mus_rg_tvnoize, 0, 0       @ Teachy TV Menu (FRLG)
 	song ph_trap_blend, 2, 2
 	song ph_trap_held, 2, 2
 	song ph_trap_solo, 2, 2
diff --git a/sound/songs/midi/mus_rg_tvnoize.mid b/sound/songs/midi/mus_rg_tvnoize.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b5d446098a7c8bd2dad5eb59f7abd570afb5e571
GIT binary patch
literal 582
zcmbu7y-LGS7>1vidip~LDGF!NNnC13rs8-oODdF7h!7|aMF+vnsaveQfi~IPyaTm2
z;Lnw4FC=~~B?-9M<-Fem-}~|Ma(dzI4WO{tMfbw{JE0S@s8ZR{HL`)NhEF<2Weq1L
zQ`Qxk%VvAdyT!}FDf>;Tv7UL6dhk#)U(^?Ei?&Pb2s<Tqh20Ww=`Vs^@?r712{z&z
zb38YZniyLDR8<^*=5xTC96zdY*jm4P>jp;raIO>2Q;*U@;)_ZPNn2D}$k`E=7IJol
zrG=cg^cO*|`HETm4cahNFIZwogRwmguon$TLz%<X9Fz9P&1oMNvYG})FX`6l)G-~p
Mnlp{@#J2hgzgvib{Qv*}

literal 0
HcmV?d00001

diff --git a/sound/songs/mus_rg_tvnoize.s b/sound/songs/mus_rg_tvnoize.s
deleted file mode 100644
index 9bfb1d9bf9..0000000000
--- a/sound/songs/mus_rg_tvnoize.s
+++ /dev/null
@@ -1,173 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_rg_tvnoize_grp, voicegroup186
-	.equ	mus_rg_tvnoize_pri, 0
-	.equ	mus_rg_tvnoize_rev, reverb_set+50
-	.equ	mus_rg_tvnoize_mvl, 127
-	.equ	mus_rg_tvnoize_key, 0
-	.equ	mus_rg_tvnoize_tbs, 1
-	.equ	mus_rg_tvnoize_exg, 0
-	.equ	mus_rg_tvnoize_cmp, 1
-
-	.section .rodata
-	.global	mus_rg_tvnoize
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_rg_tvnoize_1:
-	.byte	KEYSH , mus_rg_tvnoize_key+0
-	.byte	TEMPO , 144*mus_rg_tvnoize_tbs/2
-	.byte		VOICE , 1
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 59*mus_rg_tvnoize_mvl/mxv
-	.byte	W24
-mus_rg_tvnoize_1_B1:
-mus_rg_tvnoize_1_000:
-	.byte		N06   , Cn2 , v088
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte		        Gn1 
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte		        An1 
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte		        Bn1 
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte	PEND
-	.byte	PATT
-	 .word	mus_rg_tvnoize_1_000
-	.byte	GOTO
-	 .word	mus_rg_tvnoize_1_B1
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-mus_rg_tvnoize_2:
-	.byte	KEYSH , mus_rg_tvnoize_key+0
-	.byte		VOICE , 1
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 45*mus_rg_tvnoize_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W24
-mus_rg_tvnoize_2_B1:
-mus_rg_tvnoize_2_000:
-	.byte	W12
-	.byte		N06   , En3 , v088
-	.byte	W24
-	.byte		N06   
-	.byte	W24
-	.byte		N06   
-	.byte	W24
-	.byte		N06   
-	.byte	W12
-	.byte	PEND
-	.byte	PATT
-	 .word	mus_rg_tvnoize_2_000
-	.byte	GOTO
-	 .word	mus_rg_tvnoize_2_B1
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-mus_rg_tvnoize_3:
-	.byte	KEYSH , mus_rg_tvnoize_key+0
-	.byte		VOICE , 81
-	.byte		LFOS  , 44
-	.byte		XCMD  , xIECV , 18
-	.byte		        xIECV , 16
-	.byte		BENDR , 12
-	.byte		VOL   , 45*mus_rg_tvnoize_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte	W24
-mus_rg_tvnoize_3_B1:
-mus_rg_tvnoize_3_000:
-	.byte		N06   , Cn2 , v048
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte		        Gn1 
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte		        An1 
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte		        Bn1 
-	.byte	W12
-	.byte		        Gn3 
-	.byte	W12
-	.byte	PEND
-	.byte	PATT
-	 .word	mus_rg_tvnoize_3_000
-	.byte	GOTO
-	 .word	mus_rg_tvnoize_3_B1
-	.byte	FINE
-
-@********************** Track  4 **********************@
-
-mus_rg_tvnoize_4:
-	.byte	KEYSH , mus_rg_tvnoize_key+0
-	.byte		VOICE , 127
-	.byte		LFOS  , 44
-	.byte		XCMD  , xIECV , 18
-	.byte		        xIECV , 16
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 34*mus_rg_tvnoize_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn4 , v120
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N03   , Cn5 
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N12   , Gn4 
-	.byte	W12
-mus_rg_tvnoize_4_B1:
-	.byte		PAN   , c_v+0
-	.byte		TIE   , Cn4 , v064
-	.byte	W24
-	.byte		BEND  , c_v+9
-	.byte	W09
-	.byte		        c_v-10
-	.byte	W09
-	.byte		        c_v+0
-	.byte	W54
-	.byte		        c_v+9
-	.byte	W24
-	.byte		        c_v-8
-	.byte	W24
-	.byte		        c_v+0
-	.byte	W48
-	.byte		EOT   
-	.byte	GOTO
-	 .word	mus_rg_tvnoize_4_B1
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_rg_tvnoize:
-	.byte	4	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_rg_tvnoize_pri	@ Priority
-	.byte	mus_rg_tvnoize_rev	@ Reverb.
-
-	.word	mus_rg_tvnoize_grp
-
-	.word	mus_rg_tvnoize_1
-	.word	mus_rg_tvnoize_2
-	.word	mus_rg_tvnoize_3
-	.word	mus_rg_tvnoize_4
-
-	.end