From f043106adcc876fb68b300ed08f86f32d20ab1c4 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 2 Oct 2018 21:39:08 -0400
Subject: [PATCH] Match mus_rg_sousa.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 5e1d448885..4dc045fc72 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -1018,7 +1018,7 @@ SECTIONS {
         sound/songs/midi/mus_me_rg_photo.o(.rodata);
         sound/songs/mus_rg_titlerog.o(.rodata);
         sound/songs/midi/mus_rg_get_yasei.o(.rodata);
-        sound/songs/mus_rg_sousa.o(.rodata);
+        sound/songs/midi/mus_rg_sousa.o(.rodata);
         sound/songs/midi/mus_rg_sekaikan.o(.rodata);
         sound/songs/midi/mus_rg_seibetu.o(.rodata);
         sound/songs/midi/mus_rg_jump.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 5235d18334..9d085696cb 100644
--- a/songs.mk
+++ b/songs.mk
@@ -504,6 +504,9 @@ $(MID_SUBDIR)/mus_rg_slot.s: %.s: %.mid
 $(MID_SUBDIR)/mus_rg_slowmasara.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G159 -V092
 
+$(MID_SUBDIR)/mus_rg_sousa.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G182 -V085
+
 $(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 f1720b1727..d374a32d38 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -539,7 +539,7 @@ gSongTable:: @ 86B49F0
 	song mus_me_rg_photo, 2, 2      @ Pokémon Printer (FRLG)
 	song mus_rg_titlerog, 0, 0      @ Game Freak
 	song mus_rg_get_yasei, 0, 0     @ Fanfare: Pokémon Caught (No Intro) (FRLG)
-	song mus_rg_sousa, 0, 0         @ Starting Tutorial
+	song mus_rg_sousa, 0, 0         @ Game Tutorial (1) (FRLG)
 	song mus_rg_sekaikan, 0, 0      @ Game Tutorial (2) (FRLG)
 	song mus_rg_seibetu, 0, 0       @ Game Tutorial (3) (FRLG)
 	song mus_rg_jump, 0, 0          @ Pokémon Jump (FRLG)
diff --git a/sound/songs/midi/mus_rg_sousa.mid b/sound/songs/midi/mus_rg_sousa.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0c936e8f69ae36efeee8079afd75600da860d525
GIT binary patch
literal 575
zcmeYb$w*;fU|?flWME>D@C_--2J+Mx{ztH|FiCJQ{10SiU#P$X=dv+IH#7WaV~l0^
zug?Hc&G?()00YAY_Iid18V1Y_8Vq>o3O1lT+XM|TEd-^3>O(-{KpI6Jq>g}jB-zJ<
TW<Jb5Z1z*r-eK!cU=jcTTOEA6

literal 0
HcmV?d00001

diff --git a/sound/songs/mus_rg_sousa.s b/sound/songs/mus_rg_sousa.s
deleted file mode 100644
index 8323e7197b..0000000000
--- a/sound/songs/mus_rg_sousa.s
+++ /dev/null
@@ -1,115 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	mus_rg_sousa_grp, voicegroup182
-	.equ	mus_rg_sousa_pri, 0
-	.equ	mus_rg_sousa_rev, reverb_set+50
-	.equ	mus_rg_sousa_mvl, 127
-	.equ	mus_rg_sousa_key, 0
-	.equ	mus_rg_sousa_tbs, 1
-	.equ	mus_rg_sousa_exg, 0
-	.equ	mus_rg_sousa_cmp, 1
-
-	.section .rodata
-	.global	mus_rg_sousa
-	.align	2
-
-@********************** Track  1 **********************@
-
-mus_rg_sousa_1:
-	.byte	KEYSH , mus_rg_sousa_key+0
-	.byte	TEMPO , 120*mus_rg_sousa_tbs/2
-	.byte		VOICE , 0
-	.byte		VOL   , 85*mus_rg_sousa_mvl/mxv
-	.byte		N03   , En1 , v048
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-mus_rg_sousa_1_B1:
-mus_rg_sousa_1_000:
-	.byte		N06   , En1 , v120
-	.byte	W12
-	.byte		N06   
-	.byte	W24
-	.byte		N06   
-	.byte	W06
-	.byte		        En1 , v084
-	.byte	W06
-	.byte		        En1 , v120
-	.byte	W12
-	.byte		N06   
-	.byte	W12
-	.byte		N03   
-	.byte	W03
-	.byte		        En1 , v048
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte	PEND
-mus_rg_sousa_1_001:
-	.byte		N06   , En1 , v120
-	.byte	W12
-	.byte		N06   
-	.byte	W18
-	.byte		N06   
-	.byte	W12
-	.byte		N06   
-	.byte	W06
-	.byte		N06   
-	.byte	W06
-	.byte		        En1 , v084
-	.byte	W06
-	.byte		        En1 , v120
-	.byte	W12
-	.byte		N03   
-	.byte	W03
-	.byte		        En1 , v048
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte		N03   
-	.byte	W03
-	.byte	PEND
-	.byte	PATT
-	 .word	mus_rg_sousa_1_000
-	.byte	PATT
-	 .word	mus_rg_sousa_1_001
-	.byte	GOTO
-	 .word	mus_rg_sousa_1_B1
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-mus_rg_sousa:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	mus_rg_sousa_pri	@ Priority
-	.byte	mus_rg_sousa_rev	@ Reverb.
-
-	.word	mus_rg_sousa_grp
-
-	.word	mus_rg_sousa_1
-
-	.end