From e7464b39a37637acfdcf92f7b5ec1c8bad673ac7 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 14:57:35 -0500
Subject: [PATCH 01/53] Match se_mizu.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_mizu.mid | Bin 0 -> 105 bytes
 sound/songs/se_mizu.s        |  54 -----------------------------------
 4 files changed, 4 insertions(+), 55 deletions(-)
 create mode 100644 sound/songs/midi/se_mizu.mid
 delete mode 100644 sound/songs/se_mizu.s

diff --git a/ld_script.txt b/ld_script.txt
index 486562547..de01ac9b4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -685,7 +685,7 @@ SECTIONS {
         sound/songs/se_toy_a.o(.rodata);
         sound/songs/se_toy_b.o(.rodata);
         sound/songs/se_toy_c1.o(.rodata);
-        sound/songs/se_mizu.o(.rodata);
+        sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
         sound/songs/se_pinpon.o(.rodata);
diff --git a/songs.mk b/songs.mk
index dd65ffce7..db9fc7690 100644
--- a/songs.mk
+++ b/songs.mk
@@ -951,5 +951,8 @@ $(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
 $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
+$(MID_SUBDIR)/se_mizu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_mizu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dfdc85619c902bd033522c570937a4fa5f319abd
GIT binary patch
literal 105
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILvS2tM&ai>K
wo<W3%fy;s60fRcjgn$CZ2Mp$n44#Y)0Sv4g*mHowK|tYppl}jMj0vb80ATeObpQYW

literal 0
HcmV?d00001

diff --git a/sound/songs/se_mizu.s b/sound/songs/se_mizu.s
deleted file mode 100644
index f1c0d5e86..000000000
--- a/sound/songs/se_mizu.s
+++ /dev/null
@@ -1,54 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_mizu_grp, voicegroup128
-	.equ	se_mizu_pri, 4
-	.equ	se_mizu_rev, reverb_set+50
-	.equ	se_mizu_mvl, 127
-	.equ	se_mizu_key, 0
-	.equ	se_mizu_tbs, 1
-	.equ	se_mizu_exg, 0
-	.equ	se_mizu_cmp, 1
-
-	.section .rodata
-	.global	se_mizu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_mizu_1:
-	.byte	KEYSH , se_mizu_key+0
-	.byte	TEMPO , 150*se_mizu_tbs/2
-	.byte		VOICE , 23
-	.byte		VOL   , 20*se_mizu_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-25
-	.byte		N03   , Gs4 , v112
-	.byte	W01
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		        c_v+9
-	.byte	W04
-	.byte	W02
-	.byte		VOL   , 17*se_mizu_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte		N02   , Gs4 , v127
-	.byte	W01
-	.byte		BEND  , c_v+34
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_mizu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_mizu_pri	@ Priority
-	.byte	se_mizu_rev	@ Reverb.
-
-	.word	se_mizu_grp
-
-	.word	se_mizu_1
-
-	.end

From 68cb780ac33a01b909fd6edf098f7bbb9beeb0f1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:02:24 -0500
Subject: [PATCH 02/53] Match se_moter.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 +++
 sound/songs/midi/se_moter.mid | Bin 0 -> 87 bytes
 sound/songs/se_moter.s        |  49 ----------------------------------
 4 files changed, 4 insertions(+), 50 deletions(-)
 create mode 100644 sound/songs/midi/se_moter.mid
 delete mode 100644 sound/songs/se_moter.s

diff --git a/ld_script.txt b/ld_script.txt
index de01ac9b4..7209dd0e0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -668,7 +668,7 @@ SECTIONS {
         sound/songs/se_track_stop.o(.rodata);
         sound/songs/se_track_haiki.o(.rodata);
         sound/songs/se_track_door.o(.rodata);
-        sound/songs/se_moter.o(.rodata);
+        sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
         sound/songs/se_save.o(.rodata);
         sound/songs/midi/se_kon.o(.rodata);
diff --git a/songs.mk b/songs.mk
index db9fc7690..3a9d1b8f1 100644
--- a/songs.mk
+++ b/songs.mk
@@ -954,5 +954,8 @@ $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
 $(MID_SUBDIR)/se_mizu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4
 
+$(MID_SUBDIR)/se_moter.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_moter.mid
new file mode 100644
index 0000000000000000000000000000000000000000..8203333e540bc0506a88ea4cb660de1d3ebf801e
GIT binary patch
literal 87
zcmeYb$w*;fU|?flWME>D@C_--2J++>{ztH|FiCJQ{10SilWJi2&&C+tSO6qr8UE`t
iKvhXI9N=fzz+TV5<-qWO!GU3dc}inJgE@l%PzeAl-xRw5

literal 0
HcmV?d00001

diff --git a/sound/songs/se_moter.s b/sound/songs/se_moter.s
deleted file mode 100644
index 390835125..000000000
--- a/sound/songs/se_moter.s
+++ /dev/null
@@ -1,49 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_moter_grp, voicegroup128
-	.equ	se_moter_pri, 4
-	.equ	se_moter_rev, reverb_set+50
-	.equ	se_moter_mvl, 127
-	.equ	se_moter_key, 0
-	.equ	se_moter_tbs, 1
-	.equ	se_moter_exg, 0
-	.equ	se_moter_cmp, 1
-
-	.section .rodata
-	.global	se_moter
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_moter_1:
-	.byte	KEYSH , se_moter_key+0
-se_moter_1_B1:
-	.byte	TEMPO , 150*se_moter_tbs/2
-	.byte		VOICE , 15
-	.byte		VOL   , 90*se_moter_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		TIE   , Gn2 , v100
-	.byte	W96
-	.byte	W96
-	.byte	W48
-	.byte		EOT   
-	.byte	GOTO
-	 .word	se_moter_1_B1
-	.byte	W48
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_moter:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_moter_pri	@ Priority
-	.byte	se_moter_rev	@ Reverb.
-
-	.word	se_moter_grp
-
-	.word	se_moter_1
-
-	.end

From 3cfee40c8282556b9fa11ad8d85dd9f954e1d04c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:07:05 -0500
Subject: [PATCH 03/53] Match se_mu_pachi.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 7209dd0e0..05fe9d5ab 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -650,7 +650,7 @@ SECTIONS {
         sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/midi/se_jite_pyoko.o(.rodata);
-        sound/songs/se_mu_pachi.o(.rodata);
+        sound/songs/midi/se_mu_pachi.o(.rodata);
         sound/songs/se_tk_kasya.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/midi/se_fu_zaku2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 3a9d1b8f1..7ecf87dbb 100644
--- a/songs.mk
+++ b/songs.mk
@@ -957,5 +957,8 @@ $(MID_SUBDIR)/se_mizu.s: %.s: %.mid
 $(MID_SUBDIR)/se_moter.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4
 
+$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 5b5813ab2..69e1134af 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -36,7 +36,7 @@ gSongTable:: @ 86B49F0
 	song se_hazure, 1, 1            @ Failure
 	song se_exp, 1, 1               @ Exp. Bar
 	song se_jite_pyoko, 1, 1        @ Bunny Hop
-	song se_mu_pachi, 1, 1
+	song se_mu_pachi, 1, 1          @ Toggle Switch
 	song se_tk_kasya, 1, 1          @ Mossdeep Gym/Trick House Switch
 	song se_fu_zaku, 1, 1
 	song se_fu_zaku2, 1, 1
diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_mu_pachi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3d909dadb30270969a39745d209965975e03343c
GIT binary patch
literal 87
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILQe!w!#jt_B
go?(K0J!6AC1LJ`@h6w>cW&i`rgn$ST%?MNt03i<)j{pDw

literal 0
HcmV?d00001

diff --git a/sound/songs/se_mu_pachi.s b/sound/songs/se_mu_pachi.s
deleted file mode 100644
index dbea6603a..000000000
--- a/sound/songs/se_mu_pachi.s
+++ /dev/null
@@ -1,47 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_mu_pachi_grp, voicegroup127
-	.equ	se_mu_pachi_pri, 4
-	.equ	se_mu_pachi_rev, reverb_set+50
-	.equ	se_mu_pachi_mvl, 127
-	.equ	se_mu_pachi_key, 0
-	.equ	se_mu_pachi_tbs, 1
-	.equ	se_mu_pachi_exg, 0
-	.equ	se_mu_pachi_cmp, 1
-
-	.section .rodata
-	.global	se_mu_pachi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_mu_pachi_1:
-	.byte	KEYSH , se_mu_pachi_key+0
-	.byte	TEMPO , 150*se_mu_pachi_tbs/2
-	.byte		VOICE , 122
-	.byte		VOL   , 100*se_mu_pachi_mvl/mxv
-	.byte		N01   , Ds3 , v127
-	.byte	W02
-	.byte		VOICE , 126
-	.byte		N01   , Gs4 
-	.byte	W01
-	.byte	W03
-	.byte	W01
-	.byte		        Gs4 , v088
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_mu_pachi:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_mu_pachi_pri	@ Priority
-	.byte	se_mu_pachi_rev	@ Reverb.
-
-	.word	se_mu_pachi_grp
-
-	.word	se_mu_pachi_1
-
-	.end

From 59d691a5eed028301dedd73ee13baca43b8bd7ce Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:09:29 -0500
Subject: [PATCH 04/53] Match se_n.mid

---
 ld_script.txt             |   2 +-
 songs.mk                  |   3 +++
 sound/songs/midi/se_n.mid | Bin 0 -> 75 bytes
 sound/songs/se_n.s        |  45 --------------------------------------
 4 files changed, 4 insertions(+), 46 deletions(-)
 create mode 100644 sound/songs/midi/se_n.mid
 delete mode 100644 sound/songs/se_n.s

diff --git a/ld_script.txt b/ld_script.txt
index 05fe9d5ab..469eb8fad 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -645,7 +645,7 @@ SECTIONS {
         sound/songs/se_u.o(.rodata);
         sound/songs/midi/se_e.o(.rodata);
         sound/songs/se_o.o(.rodata);
-        sound/songs/se_n.o(.rodata);
+        sound/songs/midi/se_n.o(.rodata);
         sound/songs/se_seikai.o(.rodata);
         sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7ecf87dbb..916af1571 100644
--- a/songs.mk
+++ b/songs.mk
@@ -960,5 +960,8 @@ $(MID_SUBDIR)/se_moter.s: %.s: %.mid
 $(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
+$(MID_SUBDIR)/se_n.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_n.mid b/sound/songs/midi/se_n.mid
new file mode 100644
index 0000000000000000000000000000000000000000..282bdf216a3e9596b70a216ba8fc69f6850d8069
GIT binary patch
literal 75
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SizA%B|zdi$0N{Zn?J;MeO
X9tQS$h6fA|3=?eXJsNBnB!DUaOCb?t

literal 0
HcmV?d00001

diff --git a/sound/songs/se_n.s b/sound/songs/se_n.s
deleted file mode 100644
index dc1938b05..000000000
--- a/sound/songs/se_n.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_n_grp, voicegroup128
-	.equ	se_n_pri, 4
-	.equ	se_n_rev, reverb_set+50
-	.equ	se_n_mvl, 127
-	.equ	se_n_key, 0
-	.equ	se_n_tbs, 1
-	.equ	se_n_exg, 0
-	.equ	se_n_cmp, 1
-
-	.section .rodata
-	.global	se_n
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_n_1:
-	.byte	KEYSH , se_n_key+0
-	.byte	TEMPO , 240*se_n_tbs/2
-	.byte		VOICE , 127
-	.byte		BENDR , 12
-	.byte		VOL   , 127*se_n_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N72   , Cn3 , v127
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_n:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_n_pri	@ Priority
-	.byte	se_n_rev	@ Reverb.
-
-	.word	se_n_grp
-
-	.word	se_n_1
-
-	.end

From 9c46276911cae9b39ff3ba414b416d0e5ad2c690 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:13:22 -0500
Subject: [PATCH 05/53] Match se_nageru.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_nageru.mid | Bin 0 -> 133 bytes
 sound/songs/se_nageru.s        |  64 ---------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_nageru.mid
 delete mode 100644 sound/songs/se_nageru.s

diff --git a/ld_script.txt b/ld_script.txt
index 469eb8fad..7818c5ca6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -676,7 +676,7 @@ SECTIONS {
         sound/songs/midi/se_kon3.o(.rodata);
         sound/songs/midi/se_kon4.o(.rodata);
         sound/songs/se_suikomu.o(.rodata);
-        sound/songs/se_nageru.o(.rodata);
+        sound/songs/midi/se_nageru.o(.rodata);
         sound/songs/se_toy_c.o(.rodata);
         sound/songs/se_toy_d.o(.rodata);
         sound/songs/se_toy_e.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 916af1571..b2d711bbd 100644
--- a/songs.mk
+++ b/songs.mk
@@ -963,5 +963,8 @@ $(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
 $(MID_SUBDIR)/se_n.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
 
+$(MID_SUBDIR)/se_nageru.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_nageru.mid
new file mode 100644
index 0000000000000000000000000000000000000000..171f45a5ac9e982794f6eb2d01bce12315f8fa23
GIT binary patch
literal 133
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SilWJi2ug?IL3Sl@P#;`$z
zhk?DG;Q@mW!vxEE<_+w@Kz0aogCzsQ2C#Sv!vvdprUwkk%nS)k3{gN8IY1RbOdHre
TfV4Z1uL7janHy{vKxP8~omC%M

literal 0
HcmV?d00001

diff --git a/sound/songs/se_nageru.s b/sound/songs/se_nageru.s
deleted file mode 100644
index 379b790bd..000000000
--- a/sound/songs/se_nageru.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_nageru_grp, voicegroup128
-	.equ	se_nageru_pri, 5
-	.equ	se_nageru_rev, reverb_set+50
-	.equ	se_nageru_mvl, 127
-	.equ	se_nageru_key, 0
-	.equ	se_nageru_tbs, 1
-	.equ	se_nageru_exg, 0
-	.equ	se_nageru_cmp, 1
-
-	.section .rodata
-	.global	se_nageru
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_nageru_1:
-	.byte	KEYSH , se_nageru_key+0
-	.byte	TEMPO , 150*se_nageru_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		VOL   , 120*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+12
-	.byte		N06   , An2 , v127
-	.byte	W03
-	.byte		VOL   , 78*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W03
-	.byte		VOL   , 120*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+36
-	.byte		N18   , Cn3 
-	.byte	W02
-	.byte		BEND  , c_v+35
-	.byte	W03
-	.byte		        c_v+32
-	.byte	W02
-	.byte		        c_v+26
-	.byte	W03
-	.byte		VOL   , 102*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte	W02
-	.byte		VOL   , 68*se_nageru_mvl/mxv
-	.byte		BEND  , c_v+7
-	.byte	W03
-	.byte		VOL   , 34*se_nageru_mvl/mxv
-	.byte		BEND  , c_v-9
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_nageru:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_nageru_pri	@ Priority
-	.byte	se_nageru_rev	@ Reverb.
-
-	.word	se_nageru_grp
-
-	.word	se_nageru_1
-
-	.end

From e6484d42e92956d311bea8feb978c079a2c50be1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:16:16 -0500
Subject: [PATCH 06/53] Match se_naminori.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   7 ++-
 sound/songs/midi/se_naminori.mid | Bin 0 -> 149 bytes
 sound/songs/se_naminori.s        |  94 -------------------------------
 4 files changed, 6 insertions(+), 97 deletions(-)
 create mode 100644 sound/songs/midi/se_naminori.mid
 delete mode 100644 sound/songs/se_naminori.s

diff --git a/ld_script.txt b/ld_script.txt
index 7818c5ca6..63260bd81 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -634,7 +634,7 @@ SECTIONS {
         sound/songs/se_poke_dead.o(.rodata);
         sound/songs/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
-        sound/songs/se_naminori.o(.rodata);
+        sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
         sound/songs/se_pin.o(.rodata);
         sound/songs/midi/se_boo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b2d711bbd..1d1e3244a 100644
--- a/songs.mk
+++ b/songs.mk
@@ -952,10 +952,10 @@ $(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
 $(MID_SUBDIR)/se_mizu.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V20 -P4
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4
 
 $(MID_SUBDIR)/se_moter.s: %.s: %.mid
-	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V90 -P4
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
 $(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
@@ -966,5 +966,8 @@ $(MID_SUBDIR)/se_n.s: %.s: %.mid
 $(MID_SUBDIR)/se_nageru.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
 
+$(MID_SUBDIR)/se_naminori.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_naminori.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ba2aa4931661f44671dd4a308f15d1d1fef8bc14
GIT binary patch
literal 149
zcmXZVp$fuK7>40*|NrlNf<+j}X%@?pHj6MUGLQvvqQN4ZpxD;LaCQm16feO$n-h!=
zZ+NTv763RT5csNY9)mLUXG_G7(C^jq6Z!@IDd6+Mn-N_RwJm_IjKyHbXUax-H-?l~
n<;C%+JSca@t#G4UD_6#)Fjvl%Gou$~%87DpbV8Z7C4R3jYBL!d

literal 0
HcmV?d00001

diff --git a/sound/songs/se_naminori.s b/sound/songs/se_naminori.s
deleted file mode 100644
index 7d3c3a637..000000000
--- a/sound/songs/se_naminori.s
+++ /dev/null
@@ -1,94 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_naminori_grp, voicegroup127
-	.equ	se_naminori_pri, 4
-	.equ	se_naminori_rev, reverb_set+50
-	.equ	se_naminori_mvl, 127
-	.equ	se_naminori_key, 0
-	.equ	se_naminori_tbs, 1
-	.equ	se_naminori_exg, 0
-	.equ	se_naminori_cmp, 1
-
-	.section .rodata
-	.global	se_naminori
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_naminori_1:
-	.byte	KEYSH , se_naminori_key+0
-	.byte	TEMPO , 220*se_naminori_tbs/2
-	.byte		VOICE , 123
-	.byte		VOL   , 75*se_naminori_mvl/mxv
-	.byte		N03   , Ds3 , v127
-	.byte	W03
-	.byte		TIE   , Cn4 
-	.byte	W21
-	.byte	W24
-	.byte	W18
-	.byte		VOL   , 75*se_naminori_mvl/mxv
-	.byte	W06
-	.byte		        71*se_naminori_mvl/mxv
-	.byte	W05
-	.byte		        67*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        62*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        59*se_naminori_mvl/mxv
-	.byte	W05
-	.byte		        57*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        54*se_naminori_mvl/mxv
-	.byte	W04
-	.byte	W02
-	.byte		        50*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        49*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        44*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        41*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        38*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        35*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        32*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        28*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        24*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        21*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        18*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        14*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        11*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        9*se_naminori_mvl/mxv
-	.byte	W03
-	.byte		        6*se_naminori_mvl/mxv
-	.byte	W04
-	.byte		        3*se_naminori_mvl/mxv
-	.byte	W02
-	.byte		        1*se_naminori_mvl/mxv
-	.byte	W22
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_naminori:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_naminori_pri	@ Priority
-	.byte	se_naminori_rev	@ Reverb.
-
-	.word	se_naminori_grp
-
-	.word	se_naminori_1
-
-	.end

From 964c943feef487c1ae2e3362a9e20c2599b107fe Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:19:16 -0500
Subject: [PATCH 07/53] Match se_nigeru.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_nigeru.mid | Bin 0 -> 164 bytes
 sound/songs/se_nigeru.s        |  64 ---------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_nigeru.mid
 delete mode 100644 sound/songs/se_nigeru.s

diff --git a/ld_script.txt b/ld_script.txt
index 63260bd81..68fcaf28b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -632,7 +632,7 @@ SECTIONS {
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
         sound/songs/se_poke_dead.o(.rodata);
-        sound/songs/se_nigeru.o(.rodata);
+        sound/songs/midi/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
         sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1d1e3244a..04763ca07 100644
--- a/songs.mk
+++ b/songs.mk
@@ -969,5 +969,8 @@ $(MID_SUBDIR)/se_nageru.s: %.s: %.mid
 $(MID_SUBDIR)/se_naminori.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
 
+$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_nigeru.mid
new file mode 100644
index 0000000000000000000000000000000000000000..faf37d5294932f0269de38b209a05fbe7f2745e4
GIT binary patch
literal 164
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILDrPuP$FPCD
zo?(J-1#^Qh1H*)X0_KJQAnjDZ)ZoOxI3d6T%1?muEuj1WC|?80cYyLGpnL-;Uj)jR
KVFsE9vKj#X0462?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_nigeru.s b/sound/songs/se_nigeru.s
deleted file mode 100644
index babc7868d..000000000
--- a/sound/songs/se_nigeru.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_nigeru_grp, voicegroup127
-	.equ	se_nigeru_pri, 5
-	.equ	se_nigeru_rev, reverb_set+50
-	.equ	se_nigeru_mvl, 127
-	.equ	se_nigeru_key, 0
-	.equ	se_nigeru_tbs, 1
-	.equ	se_nigeru_exg, 0
-	.equ	se_nigeru_cmp, 1
-
-	.section .rodata
-	.global	se_nigeru
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_nigeru_1:
-	.byte	KEYSH , se_nigeru_key+0
-	.byte	TEMPO , 150*se_nigeru_tbs/2
-	.byte		VOICE , 126
-	.byte		VOL   , 90*se_nigeru_mvl/mxv
-	.byte		N03   , Fn4 , v120
-	.byte	W03
-	.byte		        Gs4 , v112
-	.byte	W03
-	.byte		N02   , Fs3 
-	.byte	W03
-	.byte		N03   , Gs4 , v072
-	.byte	W03
-	.byte		N02   , Fs3 , v096
-	.byte	W03
-	.byte		N03   , Gs4 , v056
-	.byte	W03
-	.byte		N02   , Fs3 , v080
-	.byte	W03
-	.byte		N03   , Gs4 , v040
-	.byte	W03
-	.byte		N02   , Fs3 , v064
-	.byte	W03
-	.byte		N03   , Gs4 , v024
-	.byte	W03
-	.byte		N02   , Fs3 , v048
-	.byte	W03
-	.byte		N03   , Gs4 , v020
-	.byte	W03
-	.byte		        Fs3 , v028
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_nigeru:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_nigeru_pri	@ Priority
-	.byte	se_nigeru_rev	@ Reverb.
-
-	.word	se_nigeru_grp
-
-	.word	se_nigeru_1
-
-	.end

From 8a26e51269b37f62b96324b38ef6e6e8c9cde609 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:21:21 -0500
Subject: [PATCH 08/53] Match se_o.mid

---
 ld_script.txt             |   2 +-
 songs.mk                  |   3 +++
 sound/songs/midi/se_o.mid | Bin 0 -> 75 bytes
 sound/songs/se_o.s        |  45 --------------------------------------
 4 files changed, 4 insertions(+), 46 deletions(-)
 create mode 100644 sound/songs/midi/se_o.mid
 delete mode 100644 sound/songs/se_o.s

diff --git a/ld_script.txt b/ld_script.txt
index 68fcaf28b..b04f63721 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -644,7 +644,7 @@ SECTIONS {
         sound/songs/midi/se_i.o(.rodata);
         sound/songs/se_u.o(.rodata);
         sound/songs/midi/se_e.o(.rodata);
-        sound/songs/se_o.o(.rodata);
+        sound/songs/midi/se_o.o(.rodata);
         sound/songs/midi/se_n.o(.rodata);
         sound/songs/se_seikai.o(.rodata);
         sound/songs/midi/se_hazure.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 04763ca07..2f11cdaba 100644
--- a/songs.mk
+++ b/songs.mk
@@ -972,5 +972,8 @@ $(MID_SUBDIR)/se_naminori.s: %.s: %.mid
 $(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
+$(MID_SUBDIR)/se_o.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_o.mid b/sound/songs/midi/se_o.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5dfc32727fd4289a7d7950931fc408faa1ec7f3b
GIT binary patch
literal 75
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SizA%B|zdi$0N{Zn?9m56@
X9tQS$h6fA|3=?eXJsNBnB!DUaO9>HU

literal 0
HcmV?d00001

diff --git a/sound/songs/se_o.s b/sound/songs/se_o.s
deleted file mode 100644
index a9c294f66..000000000
--- a/sound/songs/se_o.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_o_grp, voicegroup128
-	.equ	se_o_pri, 4
-	.equ	se_o_rev, reverb_set+50
-	.equ	se_o_mvl, 127
-	.equ	se_o_key, 0
-	.equ	se_o_tbs, 1
-	.equ	se_o_exg, 0
-	.equ	se_o_cmp, 1
-
-	.section .rodata
-	.global	se_o
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_o_1:
-	.byte	KEYSH , se_o_key+0
-	.byte	TEMPO , 240*se_o_tbs/2
-	.byte		VOICE , 126
-	.byte		BENDR , 12
-	.byte		VOL   , 120*se_o_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N72   , Cn3 , v127
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_o:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_o_pri	@ Priority
-	.byte	se_o_rev	@ Reverb.
-
-	.word	se_o_grp
-
-	.word	se_o_1
-
-	.end

From 5a487b29aefea6bc0a083f4bb22cb618ab006387 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 15:24:06 -0500
Subject: [PATCH 09/53] Match se_op_basyu.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index b04f63721..df10af6d7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -718,7 +718,7 @@ SECTIONS {
         sound/songs/midi/se_c_syu.o(.rodata);
         sound/songs/midi/se_c_pikon.o(.rodata);
         sound/songs/se_reapoke.o(.rodata);
-        sound/songs/se_op_basyu.o(.rodata);
+        sound/songs/midi/se_op_basyu.o(.rodata);
         sound/songs/midi/se_bt_start.o(.rodata);
         sound/songs/midi/se_dendou.o(.rodata);
         sound/songs/midi/se_jihanki.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 2f11cdaba..36cc84272 100644
--- a/songs.mk
+++ b/songs.mk
@@ -975,5 +975,8 @@ $(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
 $(MID_SUBDIR)/se_o.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
+$(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 69e1134af..29cb30b73 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -104,7 +104,7 @@ gSongTable:: @ 86B49F0
 	song se_c_syu, 1, 1             @ Contest - Pokémon Switches Out
 	song se_c_pikon, 1, 1           @ Contest - Pokémon Switches In
 	song se_reapoke, 1, 1           @ Shiny Pokémon
-	song se_op_basyu, 1, 1          @ Opening Movie -> Title Screen whoosh
+	song se_op_basyu, 1, 1          @ Opening Movie -> Title Screen Transition
 	song se_bt_start, 1, 1          @ Battle Mugshot whoosh
 	song se_dendou, 1, 1            @ Audience Cheering
 	song se_jihanki, 1, 1           @ Vending Machine
diff --git a/sound/songs/midi/se_op_basyu.mid b/sound/songs/midi/se_op_basyu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4648741c23f7cdec26e6db280adb75d72feacb96
GIT binary patch
literal 297
zcmYk%u}Z^m6vg3R?hXEn6bE&vi@3N6E=4+~wMwOg5St-T$Rt&WlOPmD(ns(~q>tdE
z^fBDhQ*?0pINZa5n-)(Gz#b7sFD+hbr6bxhj^bX2Huui`7wsi~rysuGSs!-^4f_cj
z5<Un0t~7=*Bjeh*ac+%?b7xGA)X9w8nHi-qcPeAy)W*_iY&GC_XxxuA<P4pW{~Iz5
zt;0vOVH&N&n@r`aZOC>i=ki(3)O(brawX@oP_L4i@<L8ztzIIR%2%?H7aq<noOw94
QaAM)m!-0k1t1-L(w^E=y_5c6?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_op_basyu.s b/sound/songs/se_op_basyu.s
deleted file mode 100644
index 70377b9e3..000000000
--- a/sound/songs/se_op_basyu.s
+++ /dev/null
@@ -1,174 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_op_basyu_grp, voicegroup127
-	.equ	se_op_basyu_pri, 5
-	.equ	se_op_basyu_rev, reverb_set+50
-	.equ	se_op_basyu_mvl, 127
-	.equ	se_op_basyu_key, 0
-	.equ	se_op_basyu_tbs, 1
-	.equ	se_op_basyu_exg, 0
-	.equ	se_op_basyu_cmp, 1
-
-	.section .rodata
-	.global	se_op_basyu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_op_basyu_1:
-	.byte	KEYSH , se_op_basyu_key+0
-	.byte	TEMPO , 110*se_op_basyu_tbs/2
-	.byte		VOICE , 123
-	.byte		BENDR , 12
-	.byte		VOL   , 100*se_op_basyu_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N60   , Gs2 , v052
-	.byte	W06
-	.byte	W06
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte		        c_v+1
-	.byte	W04
-	.byte		        c_v+2
-	.byte	W02
-	.byte		        c_v+3
-	.byte	W02
-	.byte		        c_v+5
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+6
-	.byte	W02
-	.byte		        c_v+8
-	.byte	W03
-	.byte		        c_v+9
-	.byte	W02
-	.byte		        c_v+11
-	.byte	W02
-	.byte		        c_v+13
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+15
-	.byte	W02
-	.byte		        c_v+17
-	.byte	W03
-	.byte		        c_v+19
-	.byte	W02
-	.byte		        c_v+24
-	.byte	W02
-	.byte		        c_v+27
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+30
-	.byte	W02
-	.byte		        c_v+38
-	.byte	W03
-	.byte		        c_v+43
-	.byte	W02
-	.byte		        c_v+56
-	.byte	W02
-	.byte		        c_v+63
-	.byte	W02
-	.byte		        c_v+0
-	.byte		N72   , Gs3 
-	.byte	W04
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+1
-	.byte	W03
-	.byte		        c_v+2
-	.byte	W02
-	.byte	W01
-	.byte		        c_v+3
-	.byte	W02
-	.byte		        c_v+5
-	.byte	W03
-	.byte		        c_v+6
-	.byte	W02
-	.byte		        c_v+8
-	.byte	W02
-	.byte		        c_v+9
-	.byte	W02
-	.byte		VOL   , 98*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+11
-	.byte	W01
-	.byte		VOL   , 96*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+13
-	.byte	W01
-	.byte		VOL   , 92*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v+15
-	.byte	W01
-	.byte		VOL   , 92*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+17
-	.byte	W01
-	.byte		VOL   , 85*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+19
-	.byte	W02
-	.byte		VOL   , 81*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+24
-	.byte	W01
-	.byte		VOL   , 74*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+27
-	.byte	W01
-	.byte		VOL   , 66*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v+30
-	.byte	W01
-	.byte		VOL   , 62*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+38
-	.byte	W01
-	.byte		VOL   , 56*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+43
-	.byte	W02
-	.byte		VOL   , 50*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+56
-	.byte	W01
-	.byte		VOL   , 42*se_op_basyu_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		VOL   , 34*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        29*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        25*se_op_basyu_mvl/mxv
-	.byte	W03
-	.byte		        23*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        19*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        14*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        11*se_op_basyu_mvl/mxv
-	.byte	W02
-	.byte		        5*se_op_basyu_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_op_basyu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_op_basyu_pri	@ Priority
-	.byte	se_op_basyu_rev	@ Reverb.
-
-	.word	se_op_basyu_grp
-
-	.word	se_op_basyu_1
-
-	.end

From b15cb16bfd445e288defe60ce266aeb783b5bd42 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:35:23 -0500
Subject: [PATCH 10/53] Match se_pc_login.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 ++
 sound/songs/midi/se_pc_login.mid | Bin 0 -> 108 bytes
 sound/songs/se_pc_login.s        |  49 -------------------------------
 4 files changed, 4 insertions(+), 50 deletions(-)
 create mode 100644 sound/songs/midi/se_pc_login.mid
 delete mode 100644 sound/songs/se_pc_login.s

diff --git a/ld_script.txt b/ld_script.txt
index df10af6d7..612818861 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -617,7 +617,7 @@ SECTIONS {
     {
         sound/songs/midi/mus_dummy.o(.rodata);
         sound/songs/midi/se_kaifuku.o(.rodata);
-        sound/songs/se_pc_login.o(.rodata);
+        sound/songs/midi/se_pc_login.o(.rodata);
         sound/songs/se_pc_off.o(.rodata);
         sound/songs/se_pc_on.o(.rodata);
         sound/songs/se_select.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 36cc84272..4ff4de9b5 100644
--- a/songs.mk
+++ b/songs.mk
@@ -978,5 +978,8 @@ $(MID_SUBDIR)/se_o.s: %.s: %.mid
 $(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_pc_login.mid b/sound/songs/midi/se_pc_login.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f46a52e7a9a2fb31fa64e579a02e5b593a87b382
GIT binary patch
literal 108
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Sii=M^sU!MUgWzBGag<*pn
p2ZJmZgB&M=EC&O7J;MVAD~1Uk1sn|?3_x0j1wzC45@0^i2mp3e7FqxR

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pc_login.s b/sound/songs/se_pc_login.s
deleted file mode 100644
index 19efbc0a1..000000000
--- a/sound/songs/se_pc_login.s
+++ /dev/null
@@ -1,49 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_login_grp, voicegroup127
-	.equ	se_pc_login_pri, 5
-	.equ	se_pc_login_rev, reverb_set+50
-	.equ	se_pc_login_mvl, 127
-	.equ	se_pc_login_key, 0
-	.equ	se_pc_login_tbs, 1
-	.equ	se_pc_login_exg, 0
-	.equ	se_pc_login_cmp, 1
-
-	.section .rodata
-	.global	se_pc_login
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_login_1:
-	.byte	KEYSH , se_pc_login_key+0
-	.byte	TEMPO , 144*se_pc_login_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pc_login_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N08   , Cn4 , v112
-	.byte	W08
-	.byte		N04   , Cn4 , v028
-	.byte	W04
-	.byte		N08   , Cn4 , v112
-	.byte	W08
-	.byte		N04   , Cn4 , v024
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_login:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_login_pri	@ Priority
-	.byte	se_pc_login_rev	@ Reverb.
-
-	.word	se_pc_login_grp
-
-	.word	se_pc_login_1
-
-	.end

From 84f43a8369aed970289eb8b83079242cede53e9b Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:39:26 -0500
Subject: [PATCH 11/53] Math se_pc_off.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 612818861..7d0944fe5 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -618,7 +618,7 @@ SECTIONS {
         sound/songs/midi/mus_dummy.o(.rodata);
         sound/songs/midi/se_kaifuku.o(.rodata);
         sound/songs/midi/se_pc_login.o(.rodata);
-        sound/songs/se_pc_off.o(.rodata);
+        sound/songs/midi/se_pc_off.o(.rodata);
         sound/songs/se_pc_on.o(.rodata);
         sound/songs/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4ff4de9b5..d7e1c10a3 100644
--- a/songs.mk
+++ b/songs.mk
@@ -981,5 +981,8 @@ $(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid
 $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_pc_off.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 29cb30b73..57f30657c 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -3,7 +3,7 @@
 gSongTable:: @ 86B49F0
 	song mus_dummy, 0, 0
 	song se_kaifuku, 1, 1           @ Healing Item
-	song se_pc_login, 1, 1          @ PC Logon
+	song se_pc_login, 1, 1          @ PC Login
 	song se_pc_off, 1, 1            @ PC Shutdown
 	song se_pc_on, 1, 1             @ PC Startup
 	song se_select, 2, 2            @ Cursor Selection
diff --git a/sound/songs/midi/se_pc_off.mid b/sound/songs/midi/se_pc_off.mid
new file mode 100644
index 0000000000000000000000000000000000000000..acb0960ff01f71319649a8a8de547efb78e976f2
GIT binary patch
literal 96
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SiU#P(FU!MUgrO$AHjbQ_O
kJ;MVA3x)|c1uP9V3=9(tfV2USRsqr~AX)-MGXb>$0KH@s`Tzg`

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pc_off.s b/sound/songs/se_pc_off.s
deleted file mode 100644
index 1d372f92f..000000000
--- a/sound/songs/se_pc_off.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_off_grp, voicegroup127
-	.equ	se_pc_off_pri, 5
-	.equ	se_pc_off_rev, reverb_set+50
-	.equ	se_pc_off_mvl, 127
-	.equ	se_pc_off_key, 0
-	.equ	se_pc_off_tbs, 1
-	.equ	se_pc_off_exg, 0
-	.equ	se_pc_off_cmp, 1
-
-	.section .rodata
-	.global	se_pc_off
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_off_1:
-	.byte	KEYSH , se_pc_off_key+0
-	.byte	TEMPO , 120*se_pc_off_tbs/2
-	.byte		VOICE , 6
-	.byte		VOL   , 100*se_pc_off_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte		N04   , Cn3 , v112
-	.byte	W04
-	.byte		        Cn2 
-	.byte	W02
-	.byte	W02
-	.byte		        Cn1 
-	.byte	W04
-	.byte		        Cn1 , v024
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_off:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_off_pri	@ Priority
-	.byte	se_pc_off_rev	@ Reverb.
-
-	.word	se_pc_off_grp
-
-	.word	se_pc_off_1
-
-	.end

From 34a8cc8acd3178dec1546068e8812f654205a130 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:41:05 -0500
Subject: [PATCH 12/53] Match se_pc_on.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_pc_on.mid | Bin 0 -> 148 bytes
 sound/songs/se_pc_on.s        |  74 ----------------------------------
 4 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 sound/songs/midi/se_pc_on.mid
 delete mode 100644 sound/songs/se_pc_on.s

diff --git a/ld_script.txt b/ld_script.txt
index 7d0944fe5..b688c2c72 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -619,7 +619,7 @@ SECTIONS {
         sound/songs/midi/se_kaifuku.o(.rodata);
         sound/songs/midi/se_pc_login.o(.rodata);
         sound/songs/midi/se_pc_off.o(.rodata);
-        sound/songs/se_pc_on.o(.rodata);
+        sound/songs/midi/se_pc_on.o(.rodata);
         sound/songs/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
diff --git a/songs.mk b/songs.mk
index d7e1c10a3..167298eb1 100644
--- a/songs.mk
+++ b/songs.mk
@@ -984,5 +984,8 @@ $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
 $(MID_SUBDIR)/se_pc_off.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_pc_on.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_pc_on.mid b/sound/songs/midi/se_pc_on.mid
new file mode 100644
index 0000000000000000000000000000000000000000..86c0fa1c663d25ea51de5576a9f40378fb8506d0
GIT binary patch
literal 148
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10Sii=M^sU!MUgmCSH}g<*pn
z2ZJmZgB&M=EC&O7J;MVAQ-%o%1w0K23_KG;0$3VC7#Jpa0BH{(?GL2=k@)EH2`MZ<
KeK7TmK&t@wjv-F~

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pc_on.s b/sound/songs/se_pc_on.s
deleted file mode 100644
index d46ced4a6..000000000
--- a/sound/songs/se_pc_on.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pc_on_grp, voicegroup127
-	.equ	se_pc_on_pri, 5
-	.equ	se_pc_on_rev, reverb_set+50
-	.equ	se_pc_on_mvl, 127
-	.equ	se_pc_on_key, 0
-	.equ	se_pc_on_tbs, 1
-	.equ	se_pc_on_exg, 0
-	.equ	se_pc_on_cmp, 1
-
-	.section .rodata
-	.global	se_pc_on
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pc_on_1:
-	.byte	KEYSH , se_pc_on_key+0
-	.byte	TEMPO , 144*se_pc_on_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pc_on_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte		N12   , Cn6 , v112
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N04   , Cn5 , v080
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 
-	.byte	W02
-	.byte	W02
-	.byte		        Gn4 
-	.byte	W01
-	.byte	W03
-	.byte		        Cn4 
-	.byte	W03
-	.byte	W01
-	.byte		        Cn5 
-	.byte	W02
-	.byte	W02
-	.byte		        Cn4 
-	.byte	W01
-	.byte	W03
-	.byte		        Cn6 , v100
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 , v080
-	.byte	W02
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pc_on:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pc_on_pri	@ Priority
-	.byte	se_pc_on_rev	@ Reverb.
-
-	.word	se_pc_on_grp
-
-	.word	se_pc_on_1
-
-	.end

From e5d535cdf42970368caff185d406e4dcf8d43c51 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:43:21 -0500
Subject: [PATCH 13/53] Match se_pin.mid

---
 ld_script.txt               |   2 +-
 songs.mk                    |   3 +++
 sound/songs/midi/se_pin.mid | Bin 0 -> 107 bytes
 sound/songs/se_pin.s        |  50 ------------------------------------
 4 files changed, 4 insertions(+), 51 deletions(-)
 create mode 100644 sound/songs/midi/se_pin.mid
 delete mode 100644 sound/songs/se_pin.s

diff --git a/ld_script.txt b/ld_script.txt
index b688c2c72..08583e6fe 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -636,7 +636,7 @@ SECTIONS {
         sound/songs/midi/se_jido_doa.o(.rodata);
         sound/songs/midi/se_naminori.o(.rodata);
         sound/songs/midi/se_ban.o(.rodata);
-        sound/songs/se_pin.o(.rodata);
+        sound/songs/midi/se_pin.o(.rodata);
         sound/songs/midi/se_boo.o(.rodata);
         sound/songs/midi/se_bowa.o(.rodata);
         sound/songs/midi/se_jyuni.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 167298eb1..ece0a9e7c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -987,5 +987,8 @@ $(MID_SUBDIR)/se_pc_off.s: %.s: %.mid
 $(MID_SUBDIR)/se_pc_on.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_pin.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_pin.mid b/sound/songs/midi/se_pin.mid
new file mode 100644
index 0000000000000000000000000000000000000000..fe59c2f97781d4983a34c880ecec14499c47e077
GIT binary patch
literal 107
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10U2R6oG*U!MUgWyNrSm0^Pj
l4+DEW!vh8fh6&O2%ni{D3=`4|m>beTv;>rPLE!^U007I`7~=o{

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pin.s b/sound/songs/se_pin.s
deleted file mode 100644
index 29d87b749..000000000
--- a/sound/songs/se_pin.s
+++ /dev/null
@@ -1,50 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pin_grp, voicegroup127
-	.equ	se_pin_pri, 4
-	.equ	se_pin_rev, reverb_set+50
-	.equ	se_pin_mvl, 127
-	.equ	se_pin_key, 0
-	.equ	se_pin_tbs, 1
-	.equ	se_pin_exg, 0
-	.equ	se_pin_cmp, 1
-
-	.section .rodata
-	.global	se_pin
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pin_1:
-	.byte	KEYSH , se_pin_key+0
-	.byte	TEMPO , 100*se_pin_tbs/2
-	.byte		VOICE , 5
-	.byte		BENDR , 12
-	.byte		VOL   , 60*se_pin_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Gn5 , v127
-	.byte	W03
-	.byte		        Gn6 , v112
-	.byte	W03
-	.byte		        Gn6 , v024
-	.byte	W03
-	.byte		        Gn6 , v068
-	.byte	W03
-	.byte		        Gn6 , v024
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pin:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pin_pri	@ Priority
-	.byte	se_pin_rev	@ Reverb.
-
-	.word	se_pin_grp
-
-	.word	se_pin_1
-
-	.end

From 7e1b74e7520ec9c892621136bde402825e8c8747 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:47:19 -0500
Subject: [PATCH 14/53] Match se_pinpon.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 08583e6fe..9844b8948 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -688,7 +688,7 @@ SECTIONS {
         sound/songs/midi/se_mizu.o(.rodata);
         sound/songs/midi/se_hashi.o(.rodata);
         sound/songs/midi/se_daugi.o(.rodata);
-        sound/songs/se_pinpon.o(.rodata);
+        sound/songs/midi/se_pinpon.o(.rodata);
         sound/songs/midi/se_fuusen1.o(.rodata);
         sound/songs/midi/se_fuusen2.o(.rodata);
         sound/songs/midi/se_fuusen3.o(.rodata);
diff --git a/songs.mk b/songs.mk
index ece0a9e7c..06a091f82 100644
--- a/songs.mk
+++ b/songs.mk
@@ -990,5 +990,8 @@ $(MID_SUBDIR)/se_pc_on.s: %.s: %.mid
 $(MID_SUBDIR)/se_pin.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4
 
+$(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 57f30657c..fe714bf8c 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -74,7 +74,7 @@ gSongTable:: @ 86B49F0
 	song se_mizu, 2, 2              @ Puddle
 	song se_hashi, 2, 2             @ Fortree Walkways
 	song se_daugi, 1, 1             @ Slots - Credits
-	song se_pinpon, 1, 1            @ Ding-dong!
+	song se_pinpon, 1, 1            @ Elevator - Reached Destination
 	song se_fuusen1, 2, 2           @ Red Balloon
 	song se_fuusen2, 2, 2           @ Blue Balloon
 	song se_fuusen3, 2, 2           @ Yellow Balloon
diff --git a/sound/songs/midi/se_pinpon.mid b/sound/songs/midi/se_pinpon.mid
new file mode 100644
index 0000000000000000000000000000000000000000..924dafda5ec57ba2ec5740c46a832921e6c73aa6
GIT binary patch
literal 130
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?ILQe!y4&#*y+
ziGjVI;Q@mq!vyabi3V>5Alsi|f_scggF6E=LbWo(K|Y3!K&20XN+)`INHhYKJ_IVA
L=<cD?2vG_EB6l8n

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pinpon.s b/sound/songs/se_pinpon.s
deleted file mode 100644
index 55145fe3b..000000000
--- a/sound/songs/se_pinpon.s
+++ /dev/null
@@ -1,98 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pinpon_grp, voicegroup127
-	.equ	se_pinpon_pri, 5
-	.equ	se_pinpon_rev, reverb_set+50
-	.equ	se_pinpon_mvl, 127
-	.equ	se_pinpon_key, 0
-	.equ	se_pinpon_tbs, 1
-	.equ	se_pinpon_exg, 0
-	.equ	se_pinpon_cmp, 1
-
-	.section .rodata
-	.global	se_pinpon
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pinpon_1:
-	.byte	KEYSH , se_pinpon_key+0
-	.byte	TEMPO , 150*se_pinpon_tbs/2
-	.byte		VOICE , 15
-	.byte		BENDR , 2
-	.byte		VOL   , 90*se_pinpon_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N24   , Ds4 , v092
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		BEND  , c_v+15
-	.byte		N36   , Bn3 
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pinpon_2:
-	.byte	KEYSH , se_pinpon_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 90*se_pinpon_mvl/mxv
-	.byte		BEND  , c_v+1
-	.byte		N24   , Ds4 , v072
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		BEND  , c_v+15
-	.byte		N36   , Bn3 
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pinpon:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pinpon_pri	@ Priority
-	.byte	se_pinpon_rev	@ Reverb.
-
-	.word	se_pinpon_grp
-
-	.word	se_pinpon_1
-	.word	se_pinpon_2
-
-	.end

From 64ae0f244d57b04b1db8cd69f9d46066905cfe79 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:49:48 -0500
Subject: [PATCH 15/53] Match se_pn_off.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_pn_off.mid | Bin 0 -> 227 bytes
 sound/songs/se_pn_off.s        |  86 ---------------------------------
 4 files changed, 4 insertions(+), 87 deletions(-)
 create mode 100644 sound/songs/midi/se_pn_off.mid
 delete mode 100644 sound/songs/se_pn_off.s

diff --git a/ld_script.txt b/ld_script.txt
index 9844b8948..e315957a3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -726,7 +726,7 @@ SECTIONS {
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
         sound/songs/se_pn_on.o(.rodata);
-        sound/songs/se_pn_off.o(.rodata);
+        sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/se_tamago.o(.rodata);
         sound/songs/se_tb_start.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 06a091f82..3692eff79 100644
--- a/songs.mk
+++ b/songs.mk
@@ -993,5 +993,8 @@ $(MID_SUBDIR)/se_pin.s: %.s: %.mid
 $(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
+$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pn_off.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2fba0d159c00c25add39fdb565aff5936b401d45
GIT binary patch
literal 227
zcmYL?F$%&!6h!AIOA;+?Y|<p;2KFK%Y_|}CkU~gnA*AyHnj7r4o<eV+H_?-<vq56@
zn3=zC>-Ka6kU$V4uiJCaw1ht>QF#WxkCW~Ozrt_o@Km^$8Hzc|8Hx<)1#hfjn@x0W
zKvpu+FdK+9%qH~H9`3|yX3bt#fzkhq2CoGk=?))k#qrrdt)q4%wF9+|T9W;=hdXi9
L4%9koNul-&O|dc_

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pn_off.s b/sound/songs/se_pn_off.s
deleted file mode 100644
index b77a55fc7..000000000
--- a/sound/songs/se_pn_off.s
+++ /dev/null
@@ -1,86 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pn_off_grp, voicegroup127
-	.equ	se_pn_off_pri, 5
-	.equ	se_pn_off_rev, reverb_set+50
-	.equ	se_pn_off_mvl, 127
-	.equ	se_pn_off_key, 0
-	.equ	se_pn_off_tbs, 1
-	.equ	se_pn_off_exg, 0
-	.equ	se_pn_off_cmp, 1
-
-	.section .rodata
-	.global	se_pn_off
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pn_off_1:
-	.byte	KEYSH , se_pn_off_key+0
-	.byte	TEMPO , 144*se_pn_off_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pn_off_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Dn4 , v060
-	.byte	W03
-	.byte		N01   , Dn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		        Gn4 , v032
-	.byte	W03
-	.byte		        Gn3 , v060
-	.byte	W02
-	.byte		        Gn3 , v032
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pn_off_2:
-	.byte	KEYSH , se_pn_off_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 50*se_pn_off_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Dn4 , v060
-	.byte	W02
-	.byte	W01
-	.byte		N01   , Dn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte		        Gn4 , v032
-	.byte	W02
-	.byte	W01
-	.byte		        Gn3 , v060
-	.byte	W02
-	.byte		        Gn3 , v032
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pn_off:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pn_off_pri	@ Priority
-	.byte	se_pn_off_rev	@ Reverb.
-
-	.word	se_pn_off_grp
-
-	.word	se_pn_off_1
-	.word	se_pn_off_2
-
-	.end

From 2a76f30d2181cecb37f840aff61d1c197cbb9ef8 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:51:23 -0500
Subject: [PATCH 16/53] Match se_pn_on.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_pn_on.mid | Bin 0 -> 227 bytes
 sound/songs/se_pn_on.s        |  86 ----------------------------------
 4 files changed, 4 insertions(+), 87 deletions(-)
 create mode 100644 sound/songs/midi/se_pn_on.mid
 delete mode 100644 sound/songs/se_pn_on.s

diff --git a/ld_script.txt b/ld_script.txt
index e315957a3..b3c9b6f46 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -725,7 +725,7 @@ SECTIONS {
         sound/songs/se_tama.o(.rodata);
         sound/songs/se_z_scroll.o(.rodata);
         sound/songs/se_z_page.o(.rodata);
-        sound/songs/se_pn_on.o(.rodata);
+        sound/songs/midi/se_pn_on.o(.rodata);
         sound/songs/midi/se_pn_off.o(.rodata);
         sound/songs/midi/se_z_search.o(.rodata);
         sound/songs/se_tamago.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 3692eff79..6ccdde421 100644
--- a/songs.mk
+++ b/songs.mk
@@ -996,5 +996,8 @@ $(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
 $(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_pn_on.mid b/sound/songs/midi/se_pn_on.mid
new file mode 100644
index 0000000000000000000000000000000000000000..dfe850794f721973fad8bdcae04ee0bfae66e474
GIT binary patch
literal 227
zcmYL?u?@m76h!YQQDP`)XwoFg2J{Fa$~2LM<N_%z1rl8r0B>NoOaU9fCNPOPM<`TJ
zclZ6=nbQ$K4nc~tGsBr_iEzjyD;2^%&HEd|3csnxGsC@BsOG3=s1%9|-dMx6o8;Pp
zY-FTn))1$eb?m1--ib5JhP`Pblm8bQuLT~(4j*jA^O>dAQ#+DcORcAtWIyfkPCT`i
KT2C!0)P4a{kuqKY

literal 0
HcmV?d00001

diff --git a/sound/songs/se_pn_on.s b/sound/songs/se_pn_on.s
deleted file mode 100644
index 9c6186399..000000000
--- a/sound/songs/se_pn_on.s
+++ /dev/null
@@ -1,86 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_pn_on_grp, voicegroup127
-	.equ	se_pn_on_pri, 5
-	.equ	se_pn_on_rev, reverb_set+50
-	.equ	se_pn_on_mvl, 127
-	.equ	se_pn_on_key, 0
-	.equ	se_pn_on_tbs, 1
-	.equ	se_pn_on_exg, 0
-	.equ	se_pn_on_cmp, 1
-
-	.section .rodata
-	.global	se_pn_on
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_pn_on_1:
-	.byte	KEYSH , se_pn_on_key+0
-	.byte	TEMPO , 144*se_pn_on_tbs/2
-	.byte		VOICE , 4
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_pn_on_mvl/mxv
-	.byte		BEND  , c_v-6
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		N01   , Cn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W03
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		        Cn4 , v032
-	.byte	W03
-	.byte		        Cn5 , v060
-	.byte	W02
-	.byte		        Cn5 , v032
-	.byte	W04
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_pn_on_2:
-	.byte	KEYSH , se_pn_on_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 50*se_pn_on_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		N01   , Cn4 , v032
-	.byte	W01
-	.byte		N02   , Gn4 , v060
-	.byte	W02
-	.byte	W01
-	.byte		N01   , Gn4 , v032
-	.byte	W01
-	.byte		N02   , Cn4 , v060
-	.byte	W02
-	.byte		        Cn4 , v032
-	.byte	W02
-	.byte	W01
-	.byte		        Cn5 , v060
-	.byte	W02
-	.byte		        Cn5 , v032
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_pn_on:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_pn_on_pri	@ Priority
-	.byte	se_pn_on_rev	@ Reverb.
-
-	.word	se_pn_on_grp
-
-	.word	se_pn_on_1
-	.word	se_pn_on_2
-
-	.end

From d9820be5b96082d1ef02abc5d50a7441ee1792a3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:54:15 -0500
Subject: [PATCH 17/53] Match se_poke_dead.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_poke_dead.mid | Bin 0 -> 161 bytes
 sound/songs/se_poke_dead.s        |  84 ------------------------------
 4 files changed, 4 insertions(+), 85 deletions(-)
 create mode 100644 sound/songs/midi/se_poke_dead.mid
 delete mode 100644 sound/songs/se_poke_dead.s

diff --git a/ld_script.txt b/ld_script.txt
index b3c9b6f46..59c0d3fb0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -631,7 +631,7 @@ SECTIONS {
         sound/songs/midi/se_kouka_m.o(.rodata);
         sound/songs/midi/se_kouka_h.o(.rodata);
         sound/songs/midi/se_bowa2.o(.rodata);
-        sound/songs/se_poke_dead.o(.rodata);
+        sound/songs/midi/se_poke_dead.o(.rodata);
         sound/songs/midi/se_nigeru.o(.rodata);
         sound/songs/midi/se_jido_doa.o(.rodata);
         sound/songs/midi/se_naminori.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 6ccdde421..e46b9e1f0 100644
--- a/songs.mk
+++ b/songs.mk
@@ -999,5 +999,8 @@ $(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
 $(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_poke_dead.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b6a0df4c8c188d85e9f53ea123041a52f4c8ae92
GIT binary patch
literal 161
zcmeYb$w*;fU|?flWME;C@C_--2J(a%{ztGdvPf_+{10U2($Ql0ug?IL5@$FN#jt_B
zp5Xz51H%N56wU?@22q5x9>c*JhK(XT4D9g?4}mHs2G}rfWY1-43}9f~$X*WR*9!yr
fObA`l42KvPHUSNtWD~&FWWxZYV}yV-8&C-Vacd@T

literal 0
HcmV?d00001

diff --git a/sound/songs/se_poke_dead.s b/sound/songs/se_poke_dead.s
deleted file mode 100644
index 0d66039a2..000000000
--- a/sound/songs/se_poke_dead.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_poke_dead_grp, voicegroup127
-	.equ	se_poke_dead_pri, 5
-	.equ	se_poke_dead_rev, reverb_set+50
-	.equ	se_poke_dead_mvl, 127
-	.equ	se_poke_dead_key, 0
-	.equ	se_poke_dead_tbs, 1
-	.equ	se_poke_dead_exg, 0
-	.equ	se_poke_dead_cmp, 1
-
-	.section .rodata
-	.global	se_poke_dead
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_poke_dead_1:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte	TEMPO , 90*se_poke_dead_tbs/2
-	.byte		VOICE , 90
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N09   , Cn4 , v100
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_poke_dead_2:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte		VOICE , 124
-	.byte		BENDR , 12
-	.byte		VOL   , 82*se_poke_dead_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N05   , Gs4 , v060
-	.byte	W03
-	.byte		VOL   , 94*se_poke_dead_mvl/mxv
-	.byte	W03
-	.byte		        103*se_poke_dead_mvl/mxv
-	.byte		N22   
-	.byte	W03
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-se_poke_dead_3:
-	.byte	KEYSH , se_poke_dead_key+0
-	.byte		VOICE , 0
-	.byte		VOL   , 110*se_poke_dead_mvl/mxv
-	.byte		N06   , Cn3 , v080
-	.byte	W06
-	.byte		N18   , Cn3 , v092
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_poke_dead:
-	.byte	3	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_poke_dead_pri	@ Priority
-	.byte	se_poke_dead_rev	@ Reverb.
-
-	.word	se_poke_dead_grp
-
-	.word	se_poke_dead_1
-	.word	se_poke_dead_2
-	.word	se_poke_dead_3
-
-	.end

From a3208dfdc6329d7d0e08f96ab28152f0b6326698 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:57:37 -0500
Subject: [PATCH 18/53] Match se_reapoke.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 +
 sound/songs/midi/se_reapoke.mid | Bin 0 -> 257 bytes
 sound/songs/se_reapoke.s        | 106 --------------------------------
 4 files changed, 4 insertions(+), 107 deletions(-)
 create mode 100644 sound/songs/midi/se_reapoke.mid
 delete mode 100644 sound/songs/se_reapoke.s

diff --git a/ld_script.txt b/ld_script.txt
index 59c0d3fb0..59f7811cd 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -717,7 +717,7 @@ SECTIONS {
         sound/songs/midi/se_c_pasi.o(.rodata);
         sound/songs/midi/se_c_syu.o(.rodata);
         sound/songs/midi/se_c_pikon.o(.rodata);
-        sound/songs/se_reapoke.o(.rodata);
+        sound/songs/midi/se_reapoke.o(.rodata);
         sound/songs/midi/se_op_basyu.o(.rodata);
         sound/songs/midi/se_bt_start.o(.rodata);
         sound/songs/midi/se_dendou.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e46b9e1f0..2c0f87310 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1002,5 +1002,8 @@ $(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
 $(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
+$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_reapoke.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b9a4fe81012363c60f0dc2c3ad779d19f9f41032
GIT binary patch
literal 257
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10Si(F|w!ug?ILy1;Nik6{CQ
zJ%b1j1D6BC0|rNi2?_O#8@QZ+Y$rwr7siGJ28eJvNZ5h3Asxz3$N=)~K+2dPYFrpW
zy3;|zNXilefP5FYX^BwX839Z{Wh@ODP=2BTkZ%oE)&N!mF)hOYVj55x#1x<ni3*G`
Uw<R(FnGOsSG8EWACIS5g0AQd#a{vGU

literal 0
HcmV?d00001

diff --git a/sound/songs/se_reapoke.s b/sound/songs/se_reapoke.s
deleted file mode 100644
index 11415920b..000000000
--- a/sound/songs/se_reapoke.s
+++ /dev/null
@@ -1,106 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_reapoke_grp, voicegroup128
-	.equ	se_reapoke_pri, 5
-	.equ	se_reapoke_rev, reverb_set+50
-	.equ	se_reapoke_mvl, 127
-	.equ	se_reapoke_key, 0
-	.equ	se_reapoke_tbs, 1
-	.equ	se_reapoke_exg, 0
-	.equ	se_reapoke_cmp, 1
-
-	.section .rodata
-	.global	se_reapoke
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_reapoke_1:
-	.byte	KEYSH , se_reapoke_key+0
-	.byte	TEMPO , 220*se_reapoke_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 95*se_reapoke_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cn6 , v127
-	.byte	W01
-	.byte		PAN   , c_v+2
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gn6 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W02
-	.byte	W03
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cn6 , v104
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte		BEND  , c_v+2
-	.byte	W02
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gn6 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W04
-	.byte	W01
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cs6 , v080
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gs6 
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W04
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cs6 , v048
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W01
-	.byte		        c_v+1
-	.byte		N06   , Gs6 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte	W02
-	.byte		        c_v+4
-	.byte		BEND  , c_v+1
-	.byte		N03   , Cs6 , v032
-	.byte	W01
-	.byte		BEND  , c_v+2
-	.byte	W01
-	.byte		        c_v+4
-	.byte	W02
-	.byte		        c_v+0
-	.byte		N06   , Gs6 
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_reapoke:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_reapoke_pri	@ Priority
-	.byte	se_reapoke_rev	@ Reverb.
-
-	.word	se_reapoke_grp
-
-	.word	se_reapoke_1
-
-	.end

From 3f7e0884713997b9c548d7cc940b4e615057921c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 16:59:59 -0500
Subject: [PATCH 19/53] Match se_regi.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_regi.mid | Bin 0 -> 130 bytes
 sound/songs/se_regi.s        |  63 -----------------------------------
 4 files changed, 4 insertions(+), 64 deletions(-)
 create mode 100644 sound/songs/midi/se_regi.mid
 delete mode 100644 sound/songs/se_regi.s

diff --git a/ld_script.txt b/ld_script.txt
index 59f7811cd..d5c4eafab 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -710,7 +710,7 @@ SECTIONS {
         sound/songs/se_tamakoro.o(.rodata);
         sound/songs/se_tamakoro_e.o(.rodata);
         sound/songs/midi/se_basabasa.o(.rodata);
-        sound/songs/se_regi.o(.rodata);
+        sound/songs/midi/se_regi.o(.rodata);
         sound/songs/midi/se_c_gaji.o(.rodata);
         sound/songs/midi/se_c_maku_u.o(.rodata);
         sound/songs/midi/se_c_maku_d.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 2c0f87310..1e626a8fc 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1005,5 +1005,8 @@ $(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
 $(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
 
+$(MID_SUBDIR)/se_regi.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_regi.mid
new file mode 100644
index 0000000000000000000000000000000000000000..28b727cb5ea4f01c8d1de2fb5f9d64ed21812380
GIT binary patch
literal 130
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD~nU{10SiSLb8+ug?IL(qcHk#;`$z
zhk?DG;Q@m^!vy<!#s+%^#tAMd%ndFKOcNqK1R5e47!f+;84mI>Yy>KQ$Y8-V(Zz<j
O5vXipq>Vr$L>U0+I2~~S

literal 0
HcmV?d00001

diff --git a/sound/songs/se_regi.s b/sound/songs/se_regi.s
deleted file mode 100644
index 2bc43c515..000000000
--- a/sound/songs/se_regi.s
+++ /dev/null
@@ -1,63 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_regi_grp, voicegroup127
-	.equ	se_regi_pri, 5
-	.equ	se_regi_rev, reverb_set+50
-	.equ	se_regi_mvl, 127
-	.equ	se_regi_key, 0
-	.equ	se_regi_tbs, 1
-	.equ	se_regi_exg, 0
-	.equ	se_regi_cmp, 1
-
-	.section .rodata
-	.global	se_regi
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_regi_1:
-	.byte	KEYSH , se_regi_key+0
-	.byte	TEMPO , 128*se_regi_tbs/2
-	.byte		VOICE , 6
-	.byte		BENDR , 12
-	.byte		VOL   , 90*se_regi_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N01   , Ds3 , v127
-	.byte	W02
-	.byte		N03   , Gs3 , v100
-	.byte	W05
-	.byte		N16   , Fn5 , v072
-	.byte	W05
-	.byte	W12
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_regi_2:
-	.byte	KEYSH , se_regi_key+0
-	.byte		VOICE , 14
-	.byte		VOL   , 90*se_regi_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W02
-	.byte		N03   , Gs3 , v060
-	.byte	W05
-	.byte		N16   , Fn5 
-	.byte	W05
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_regi:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_regi_pri	@ Priority
-	.byte	se_regi_rev	@ Reverb.
-
-	.word	se_regi_grp
-
-	.word	se_regi_1
-	.word	se_regi_2
-
-	.end

From 6b6e1882e4ceacd3b99eaefd19bbf5f96312f6c1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:02:01 -0500
Subject: [PATCH 20/53] Match se_rg_bag1.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_rg_bag1.mid | Bin 0 -> 115 bytes
 sound/songs/se_rg_bag1.s        |  60 --------------------------------
 4 files changed, 4 insertions(+), 61 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_bag1.mid
 delete mode 100644 sound/songs/se_rg_bag1.s

diff --git a/ld_script.txt b/ld_script.txt
index d5c4eafab..45a2c2368 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -867,7 +867,7 @@ SECTIONS {
         sound/songs/se_rg_card1.o(.rodata);
         sound/songs/se_rg_card2.o(.rodata);
         sound/songs/se_rg_card3.o(.rodata);
-        sound/songs/se_rg_bag1.o(.rodata);
+        sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/se_rg_bag2.o(.rodata);
         sound/songs/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1e626a8fc..409d191a5 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1008,5 +1008,8 @@ $(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
 $(MID_SUBDIR)/se_regi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
+$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_bag1.mid b/sound/songs/midi/se_rg_bag1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ac783bd382467e3b8c7531cce86fc5f4325c355c
GIT binary patch
literal 115
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10Si`ohETU!MUgrOa@Ei(!Kt
z2ZJmJgB&M_WUps<z~IC%!PA4W!IOalp;VmVU=72>P!Gn&PzHvH;TepL;SB6RX#gd}
B7}Wp(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_bag1.s b/sound/songs/se_rg_bag1.s
deleted file mode 100644
index d2dd38ed5..000000000
--- a/sound/songs/se_rg_bag1.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_bag1_grp, voicegroup129
-	.equ	se_rg_bag1_pri, 5
-	.equ	se_rg_bag1_rev, reverb_set+50
-	.equ	se_rg_bag1_mvl, 127
-	.equ	se_rg_bag1_key, 0
-	.equ	se_rg_bag1_tbs, 1
-	.equ	se_rg_bag1_exg, 0
-	.equ	se_rg_bag1_cmp, 1
-
-	.section .rodata
-	.global	se_rg_bag1
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_bag1_1:
-	.byte	KEYSH , se_rg_bag1_key+0
-	.byte	TEMPO , 310*se_rg_bag1_tbs/2
-	.byte		VOICE , 10
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*se_rg_bag1_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N01   , Cs4 , v072
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_bag1_2:
-	.byte		VOL   , 127*se_rg_bag1_mvl/mxv
-	.byte	KEYSH , se_rg_bag1_key+0
-	.byte		VOICE , 124
-	.byte		N01   , Cs5 , v072
-	.byte	W01
-	.byte		        Ds5 , v104
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_bag1:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_bag1_pri	@ Priority
-	.byte	se_rg_bag1_rev	@ Reverb.
-
-	.word	se_rg_bag1_grp
-
-	.word	se_rg_bag1_1
-	.word	se_rg_bag1_2
-
-	.end

From d400b28edba2e4a44831a3c43deb102f6074f1e9 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:03:47 -0500
Subject: [PATCH 21/53] Match se_rg_bag2.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_rg_bag2.mid | Bin 0 -> 145 bytes
 sound/songs/se_rg_bag2.s        |  65 --------------------------------
 4 files changed, 4 insertions(+), 66 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_bag2.mid
 delete mode 100644 sound/songs/se_rg_bag2.s

diff --git a/ld_script.txt b/ld_script.txt
index 45a2c2368..df39a16d3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -868,7 +868,7 @@ SECTIONS {
         sound/songs/se_rg_card2.o(.rodata);
         sound/songs/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
-        sound/songs/se_rg_bag2.o(.rodata);
+        sound/songs/midi/se_rg_bag2.o(.rodata);
         sound/songs/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
         sound/songs/se_rg_kiteki.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 409d191a5..67a4a484c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1011,5 +1011,8 @@ $(MID_SUBDIR)/se_regi.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_bag2.mid b/sound/songs/midi/se_rg_bag2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..97a5b32df73a9600062c88699637094f3cee3cba
GIT binary patch
literal 145
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10Si(oSLcug?ILQfD|2z_5Yc
zf#Csz1H%Nb5T*t%1|U0-VS--(;{yf>rUpL-Muc)hhJ#ED8|63{WH}h*I6)+PJp-2m
b!$Y9%i4OHFjSdVT6%*a-nHt?0K=uFtyKWz&

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_bag2.s b/sound/songs/se_rg_bag2.s
deleted file mode 100644
index 7d4f338c5..000000000
--- a/sound/songs/se_rg_bag2.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_bag2_grp, voicegroup129
-	.equ	se_rg_bag2_pri, 5
-	.equ	se_rg_bag2_rev, reverb_set+50
-	.equ	se_rg_bag2_mvl, 127
-	.equ	se_rg_bag2_key, 0
-	.equ	se_rg_bag2_tbs, 1
-	.equ	se_rg_bag2_exg, 0
-	.equ	se_rg_bag2_cmp, 1
-
-	.section .rodata
-	.global	se_rg_bag2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_bag2_1:
-	.byte	KEYSH , se_rg_bag2_key+0
-	.byte	TEMPO , 422*se_rg_bag2_tbs/2
-	.byte		VOICE , 80
-	.byte		VOL   , 64*se_rg_bag2_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Dn4 , v084
-	.byte	W02
-	.byte		BEND  , c_v+17
-	.byte		N03   , Fs4 , v080
-	.byte	W01
-	.byte		BEND  , c_v-40
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_bag2_2:
-	.byte	KEYSH , se_rg_bag2_key+0
-	.byte		VOICE , 2
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 127*se_rg_bag2_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N04   , En3 , v127
-	.byte	W03
-	.byte	W01
-	.byte		VOICE , 2
-	.byte		N02   , Bn3 
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_bag2:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_bag2_pri	@ Priority
-	.byte	se_rg_bag2_rev	@ Reverb.
-
-	.word	se_rg_bag2_grp
-
-	.word	se_rg_bag2_1
-	.word	se_rg_bag2_2
-
-	.end

From 499de4f7c6b8692fa0b89f600c305df9f0dcd1e2 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:05:11 -0500
Subject: [PATCH 22/53] Match se_rg_card1.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 ++
 sound/songs/midi/se_rg_card1.mid | Bin 0 -> 98 bytes
 sound/songs/se_rg_card1.s        |  48 -------------------------------
 4 files changed, 4 insertions(+), 49 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_card1.mid
 delete mode 100644 sound/songs/se_rg_card1.s

diff --git a/ld_script.txt b/ld_script.txt
index df39a16d3..65899eb9b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -864,7 +864,7 @@ SECTIONS {
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
         sound/songs/se_rg_w_door.o(.rodata);
-        sound/songs/se_rg_card1.o(.rodata);
+        sound/songs/midi/se_rg_card1.o(.rodata);
         sound/songs/se_rg_card2.o(.rodata);
         sound/songs/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 67a4a484c..c4efe8c4f 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1014,5 +1014,8 @@ $(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_card1.mid b/sound/songs/midi/se_rg_card1.mid
new file mode 100644
index 0000000000000000000000000000000000000000..22a50e6dfc839c947566a0dd8d40ffd16c22484e
GIT binary patch
literal 98
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SiWk1I7U!MUgWyo-#mSKY&
s2ZJmJgB&M_<Z@tOuV;9`;KVS&qn@$BgMsNl4a0;G2gZgF1|6VA0H}c!#{d8T

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_card1.s b/sound/songs/se_rg_card1.s
deleted file mode 100644
index 1f2d72c3e..000000000
--- a/sound/songs/se_rg_card1.s
+++ /dev/null
@@ -1,48 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card1_grp, voicegroup129
-	.equ	se_rg_card1_pri, 5
-	.equ	se_rg_card1_rev, reverb_set+50
-	.equ	se_rg_card1_mvl, 127
-	.equ	se_rg_card1_key, 0
-	.equ	se_rg_card1_tbs, 1
-	.equ	se_rg_card1_exg, 0
-	.equ	se_rg_card1_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card1
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card1_1:
-	.byte	KEYSH , se_rg_card1_key+0
-	.byte	TEMPO , 182*se_rg_card1_tbs/2
-	.byte		VOICE , 125
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 127*se_rg_card1_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N01   , Cn4 , v127
-	.byte	W03
-	.byte		VOICE , 124
-	.byte		N01   , Cn5 , v064
-	.byte	W21
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card1:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card1_pri	@ Priority
-	.byte	se_rg_card1_rev	@ Reverb.
-
-	.word	se_rg_card1_grp
-
-	.word	se_rg_card1_1
-
-	.end

From 0a0a41189e6c01cdfc55c49213883d5e1f8c34e2 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:07:00 -0500
Subject: [PATCH 23/53] Match se_rg_card2.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 ++
 sound/songs/midi/se_rg_card2.mid | Bin 0 -> 109 bytes
 sound/songs/se_rg_card2.s        |  62 -------------------------------
 4 files changed, 4 insertions(+), 63 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_card2.mid
 delete mode 100644 sound/songs/se_rg_card2.s

diff --git a/ld_script.txt b/ld_script.txt
index 65899eb9b..96fd2cc20 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -865,7 +865,7 @@ SECTIONS {
         sound/songs/se_w063b.o(.rodata);
         sound/songs/se_rg_w_door.o(.rodata);
         sound/songs/midi/se_rg_card1.o(.rodata);
-        sound/songs/se_rg_card2.o(.rodata);
+        sound/songs/midi/se_rg_card2.o(.rodata);
         sound/songs/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c4efe8c4f..ab9873e04 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1017,5 +1017,8 @@ $(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_card2.mid b/sound/songs/midi/se_rg_card2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..02276b2ad0cb428ec38650c76fb9bc31f83d0aa7
GIT binary patch
literal 109
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SiWk1I7U!MUgWy5fwmSKY&
z2ZJmJgB&M_<Z@tO7hrh6;KVQ?I)Zrvy8<)20W-S;GkX9tdjd0i0W*6&b3-&k0?-Tq
DQ+gDJ

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_card2.s b/sound/songs/se_rg_card2.s
deleted file mode 100644
index 7f83de097..000000000
--- a/sound/songs/se_rg_card2.s
+++ /dev/null
@@ -1,62 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card2_grp, voicegroup129
-	.equ	se_rg_card2_pri, 5
-	.equ	se_rg_card2_rev, reverb_set+50
-	.equ	se_rg_card2_mvl, 127
-	.equ	se_rg_card2_key, 0
-	.equ	se_rg_card2_tbs, 1
-	.equ	se_rg_card2_exg, 0
-	.equ	se_rg_card2_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card2_1:
-	.byte	KEYSH , se_rg_card2_key+0
-	.byte	TEMPO , 182*se_rg_card2_tbs/2
-	.byte		VOICE , 125
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 16*se_rg_card2_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N24   , Gn5 , v088
-	.byte	W03
-	.byte		VOL   , 32*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        48*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        64*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        80*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        96*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        112*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte		        127*se_rg_card2_mvl/mxv
-	.byte	W03
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card2_pri	@ Priority
-	.byte	se_rg_card2_rev	@ Reverb.
-
-	.word	se_rg_card2_grp
-
-	.word	se_rg_card2_1
-
-	.end

From f31301340cd339ee02eace2dc20ecd8c51770e81 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:15:19 -0500
Subject: [PATCH 24/53] Match se_rg_card3.mid

---
 ld_script.txt                    |   2 +-
 songs.mk                         |   3 +
 sound/songs/midi/se_rg_card3.mid | Bin 0 -> 269 bytes
 sound/songs/se_rg_card3.s        | 110 -------------------------------
 4 files changed, 4 insertions(+), 111 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_card3.mid
 delete mode 100644 sound/songs/se_rg_card3.s

diff --git a/ld_script.txt b/ld_script.txt
index 96fd2cc20..1548f8227 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -866,7 +866,7 @@ SECTIONS {
         sound/songs/se_rg_w_door.o(.rodata);
         sound/songs/midi/se_rg_card1.o(.rodata);
         sound/songs/midi/se_rg_card2.o(.rodata);
-        sound/songs/se_rg_card3.o(.rodata);
+        sound/songs/midi/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
         sound/songs/se_rg_getting.o(.rodata);
diff --git a/songs.mk b/songs.mk
index ab9873e04..bf463b17f 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1020,5 +1020,8 @@ $(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
+$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_card3.mid b/sound/songs/midi/se_rg_card3.mid
new file mode 100644
index 0000000000000000000000000000000000000000..47cc451d0d9e7d16197074d88900bf09f19dbeda
GIT binary patch
literal 269
zcmYk$u?oU46a~;*pPDER1(z<Cj!rtd7AHG&5Hbi_x^xgk4bFn~57IxWi?jZT|KU(y
zO2ID4&B-NsvD#+<`fxz-Vs$z2X^d*qbvm9zwWi+ki)xPM>WSA3r7tm&@CSAkHw?pO
z{UC%%H023UiU=m<oZ8GK7berhOgVp9lV+O!i7Vp76tqY~9GScpacj%uwuoDnMof$P
fd6P-bWb^7jy^r@54?AvzLhb0TK!pnIe&*H><N7^(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_card3.s b/sound/songs/se_rg_card3.s
deleted file mode 100644
index e456c6bbe..000000000
--- a/sound/songs/se_rg_card3.s
+++ /dev/null
@@ -1,110 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_card3_grp, voicegroup129
-	.equ	se_rg_card3_pri, 5
-	.equ	se_rg_card3_rev, reverb_set+50
-	.equ	se_rg_card3_mvl, 127
-	.equ	se_rg_card3_key, 0
-	.equ	se_rg_card3_tbs, 1
-	.equ	se_rg_card3_exg, 0
-	.equ	se_rg_card3_cmp, 1
-
-	.section .rodata
-	.global	se_rg_card3
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_card3_1:
-	.byte	KEYSH , se_rg_card3_key+0
-	.byte	TEMPO , 174*se_rg_card3_tbs/2
-	.byte		VOICE , 46
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N03   , An5 , v112
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte		N03   , Bn5 
-	.byte	W03
-	.byte		VOL   , 112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte		N06   , En6 
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		        112*se_rg_card3_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte		N06   , En6 , v040
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 97*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v032
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 96*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v024
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-48
-	.byte		VOL   , 80*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v016
-	.byte	W03
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+48
-	.byte		VOL   , 80*se_rg_card3_mvl/mxv
-	.byte		N06   , En6 , v012
-	.byte	W03
-	.byte		VOL   , 48*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte		N06   , En6 , v008
-	.byte	W03
-	.byte		VOL   , 2*se_rg_card3_mvl/mxv
-	.byte	W03
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_card3_2:
-	.byte	KEYSH , se_rg_card3_key+0
-	.byte		VOICE , 124
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_rg_card3_mvl/mxv
-	.byte		N03   , Cn5 , v092
-	.byte	W06
-	.byte		        Cn5 , v032
-	.byte	W18
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_card3:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_card3_pri	@ Priority
-	.byte	se_rg_card3_rev	@ Reverb.
-
-	.word	se_rg_card3_grp
-
-	.word	se_rg_card3_1
-	.word	se_rg_card3_2
-
-	.end

From f2bb46c960f02e9a542621d3309daf9391cade07 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:17:48 -0500
Subject: [PATCH 25/53] Match se_rg_deomov.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 +
 sound/songs/midi/se_rg_deomov.mid | Bin 0 -> 466 bytes
 sound/songs/se_rg_deomov.s        | 204 ------------------------------
 4 files changed, 4 insertions(+), 205 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_deomov.mid
 delete mode 100644 sound/songs/se_rg_deomov.s

diff --git a/ld_script.txt b/ld_script.txt
index 1548f8227..db5a3a629 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -875,7 +875,7 @@ SECTIONS {
         sound/songs/se_rg_help_op.o(.rodata);
         sound/songs/se_rg_help_cl.o(.rodata);
         sound/songs/se_rg_help_ng.o(.rodata);
-        sound/songs/se_rg_deomov.o(.rodata);
+        sound/songs/midi/se_rg_deomov.o(.rodata);
         sound/songs/se_rg_excellent.o(.rodata);
         sound/songs/se_rg_nawamiss.o(.rodata);
         sound/songs/se_toreeye.o(.rodata);
diff --git a/songs.mk b/songs.mk
index bf463b17f..5faad66b5 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1023,5 +1023,8 @@ $(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5
 
+$(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_deomov.mid b/sound/songs/midi/se_rg_deomov.mid
new file mode 100644
index 0000000000000000000000000000000000000000..0149d29dbb32cc33a268d8fc95b66a662b31c555
GIT binary patch
literal 466
zcmYk2-%0{e5XQe9k7w2;D#*aV%!?p`D2br1Vp&BLbX8nUyz(Nb2tv9tg8cIW*?E%m
z392W_%bvn!Wub1)Z_b%-zHd0y;Px7Th6ROGHF&(2+ZL7`Wl_q;vJs2DykdERsC9ym
zXS`=@?ApjA!qaiVF23Pmnj6q42R#i2Y7}66_BZx~&pphxkC0pg55t*-<h)g~=>-ym
zb;1rIOE@GP6V3^jggW7h&?DRs`h)>t=+3yW_)c?AbH`?1b5XOa`9gC}@d0s`IHh<~
zGxWHEe|!Jn>lAZ-fP<7Xgz;T#;v;VA!a8W~fK5m04wUH%yW!i=F>R^aAQK1!XwfO-
zN$ts7L0Et-I%S$tHxY~UG0`O=AKSE~*Fs!$WXk*2qzuaxg+<Bqgex!M$}99pN14Jv
gcJzh5<duXa>F0%cDDl&#mb4}{@oNYh*pMIp1><gDoB#j-

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_deomov.s b/sound/songs/se_rg_deomov.s
deleted file mode 100644
index 7c2e691bf..000000000
--- a/sound/songs/se_rg_deomov.s
+++ /dev/null
@@ -1,204 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_deomov_grp, voicegroup129
-	.equ	se_rg_deomov_pri, 5
-	.equ	se_rg_deomov_rev, reverb_set+50
-	.equ	se_rg_deomov_mvl, 127
-	.equ	se_rg_deomov_key, 0
-	.equ	se_rg_deomov_tbs, 1
-	.equ	se_rg_deomov_exg, 0
-	.equ	se_rg_deomov_cmp, 1
-
-	.section .rodata
-	.global	se_rg_deomov
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_deomov_1:
-	.byte	KEYSH , se_rg_deomov_key+0
-	.byte	TEMPO , 262*se_rg_deomov_tbs/2
-	.byte		VOICE , 123
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 40*se_rg_deomov_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte		N02   , Cn2 , v120
-	.byte	W08
-	.byte		N04   , Cn5 
-	.byte	W16
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_deomov_2:
-	.byte	KEYSH , se_rg_deomov_key+0
-	.byte		VOICE , 31
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 80*se_rg_deomov_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-64
-	.byte		TIE   , En4 , v032
-	.byte	W24
-	.byte	W04
-	.byte		BEND  , c_v-55
-	.byte	W02
-	.byte		        c_v-50
-	.byte	W02
-	.byte		        c_v-39
-	.byte	W02
-	.byte		        c_v-32
-	.byte	W02
-	.byte		        c_v-23
-	.byte	W02
-	.byte		        c_v-18
-	.byte	W02
-	.byte		        c_v-9
-	.byte	W02
-	.byte		        c_v-2
-	.byte	W02
-	.byte		        c_v+16
-	.byte	W02
-	.byte		        c_v+23
-	.byte	W02
-	.byte		        c_v+32
-	.byte	W02
-	.byte		        c_v+39
-	.byte	W02
-	.byte		        c_v+48
-	.byte	W02
-	.byte		        c_v+56
-	.byte	W02
-	.byte		        c_v+63
-	.byte	W16
-	.byte	W24
-	.byte	W24
-	.byte		VOL   , 70*se_rg_deomov_mvl/mxv
-	.byte	W04
-	.byte		        66*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        60*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        55*se_rg_deomov_mvl/mxv
-	.byte	W08
-	.byte		        49*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        44*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        40*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        35*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        30*se_rg_deomov_mvl/mxv
-	.byte	W04
-	.byte		        24*se_rg_deomov_mvl/mxv
-	.byte	W02
-	.byte		        20*se_rg_deomov_mvl/mxv
-	.byte	W02
-	.byte		        15*se_rg_deomov_mvl/mxv
-	.byte	W04
-	.byte		        10*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		        0*se_rg_deomov_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@********************** Track  3 **********************@
-
-se_rg_deomov_3:
-	.byte	KEYSH , se_rg_deomov_key+0
-	.byte		VOICE , 50
-	.byte		VOL   , 69*se_rg_deomov_mvl/mxv
-	.byte		PAN   , c_v-64
-	.byte	W24
-	.byte		        c_v+63
-	.byte		N01   , Fs4 , v064
-	.byte	W06
-	.byte		        Gs4 
-	.byte	W03
-	.byte		PAN   , c_v-64
-	.byte	W07
-	.byte		N01   , En5 
-	.byte	W05
-	.byte		        Fs5 
-	.byte	W03
-	.byte		PAN   , c_v+63
-	.byte	W10
-	.byte		N01   , Dn5 
-	.byte	W03
-	.byte		        Cn5 
-	.byte	W07
-	.byte		PAN   , c_v-64
-	.byte	W04
-	.byte		N01   , Fs3 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W09
-	.byte		PAN   , c_v+63
-	.byte	W04
-	.byte		N01   , Bn4 
-	.byte	W04
-	.byte		        Dn5 
-	.byte	W04
-	.byte		PAN   , c_v-64
-	.byte	W09
-	.byte		N01   , Fs5 
-	.byte	W09
-	.byte		        Cs5 
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte	W02
-	.byte		N01   , Cs4 , v036
-	.byte	W02
-	.byte		        As3 
-	.byte	W08
-	.byte		        Fs3 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W09
-	.byte		PAN   , c_v-64
-	.byte	W03
-	.byte		N01   , Dn5 , v028
-	.byte	W03
-	.byte		        Cn5 
-	.byte	W06
-	.byte		        Fs4 
-	.byte	W03
-	.byte		        Cn4 
-	.byte	W04
-	.byte		        Gn3 
-	.byte	W05
-	.byte		PAN   , c_v+63
-	.byte	W06
-	.byte		N01   , Gn4 , v020
-	.byte	W02
-	.byte		        An4 
-	.byte	W16
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_deomov:
-	.byte	3	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_deomov_pri	@ Priority
-	.byte	se_rg_deomov_rev	@ Reverb.
-
-	.word	se_rg_deomov_grp
-
-	.word	se_rg_deomov_1
-	.word	se_rg_deomov_2
-	.word	se_rg_deomov_3
-
-	.end

From d00ae0da559b877c05cf0faff9f07fd12001183c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:20:31 -0500
Subject: [PATCH 26/53] Match se_rg_excellent.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index db5a3a629..af50e003e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -876,7 +876,7 @@ SECTIONS {
         sound/songs/se_rg_help_cl.o(.rodata);
         sound/songs/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
-        sound/songs/se_rg_excellent.o(.rodata);
+        sound/songs/midi/se_rg_excellent.o(.rodata);
         sound/songs/se_rg_nawamiss.o(.rodata);
         sound/songs/se_toreeye.o(.rodata);
         sound/songs/se_toreoff.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 5faad66b5..3a85d7e51 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1026,5 +1026,8 @@ $(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
 
+$(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index fe714bf8c..9b4564e22 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -262,7 +262,7 @@ gSongTable:: @ 86B49F0
 	song se_rg_help_cl, 1, 1        @ Help Menu Close (FRLG)
 	song se_rg_help_ng, 1, 1        @ Help Menu Error (FRLG)
 	song se_rg_deomov, 1, 1         @ Deoxys Moves
-	song se_rg_excellent, 1, 1
+	song se_rg_excellent, 1, 1      @ HP Restored (FRLG)
 	song se_rg_nawamiss, 1, 1
 	song se_toreeye, 1, 1           @ Trainer's Eye Call
 	song se_toreoff, 1, 1           @ Trainer's Eye Hang Up
diff --git a/sound/songs/midi/se_rg_excellent.mid b/sound/songs/midi/se_rg_excellent.mid
new file mode 100644
index 0000000000000000000000000000000000000000..8f7c267c4b129b55e8f3074ab83a5c0533309a01
GIT binary patch
literal 436
zcmYL^O=^Qs6orq^G$~HoLFgjdQc_4E0|yyM$e*Ah5+RBNrIXMN)VG7@PSUQR9d;M(
zO3cw*=;++@{P^&!g0cWGgasSpRq*!8c7rw^SXbj~w7xyOtI<9{KK<b99;eYeZWSCC
zzt~tNKdL$hOvcP$og5D)<(={^VJ6Io838Bf#WGRZ-zF?n9d^76<L_1NlUwgpy=E?A
zRWCZe^YiZgLGL%|R@_T*d*Xg1I~Ud!b|&mp*h$CQ|ARj9{frN;89m_-8#L8X=?Z8L
z%mb6_bPlWGI-Rj|nNHa+i6$wP=E5c_l#ciw?v)PN{hiW2dlic>5Z_jOOYwOZUo{ub
P6>cWnRJcjU4fyA0zx;3)

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_excellent.s b/sound/songs/se_rg_excellent.s
deleted file mode 100644
index 63c0eae19..000000000
--- a/sound/songs/se_rg_excellent.s
+++ /dev/null
@@ -1,155 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_excellent_grp, voicegroup128
-	.equ	se_rg_excellent_pri, 5
-	.equ	se_rg_excellent_rev, reverb_set+50
-	.equ	se_rg_excellent_mvl, 127
-	.equ	se_rg_excellent_key, 0
-	.equ	se_rg_excellent_tbs, 1
-	.equ	se_rg_excellent_exg, 0
-	.equ	se_rg_excellent_cmp, 1
-
-	.section .rodata
-	.global	se_rg_excellent
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_excellent_1:
-	.byte	KEYSH , se_rg_excellent_key+0
-	.byte	TEMPO , 150*se_rg_excellent_tbs/2
-	.byte		VOICE , 46
-	.byte		VOL   , 110*se_rg_excellent_mvl/mxv
-	.byte		BENDR , 2
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+15
-	.byte	W01
-	.byte		N02   , Dn6 , v112
-	.byte	W02
-	.byte		        Cs6 
-	.byte	W03
-	.byte		PAN   , c_v+8
-	.byte		N02   , An5 
-	.byte	W02
-	.byte		        Fs5 
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 
-	.byte	W02
-	.byte		PAN   , c_v-7
-	.byte	W01
-	.byte		N02   , Dn5 , v104
-	.byte	W02
-	.byte		        Cs5 , v100
-	.byte	W03
-	.byte		PAN   , c_v+0
-	.byte		N02   , An4 , v096
-	.byte	W02
-	.byte		        Fs4 , v092
-	.byte	W01
-	.byte	W01
-	.byte		        Dn4 , v088
-	.byte	W02
-	.byte		PAN   , c_v+15
-	.byte	W01
-	.byte		N02   , Dn6 
-	.byte	W02
-	.byte		        Cs6 , v084
-	.byte	W03
-	.byte		        An5 , v080
-	.byte	W02
-	.byte		        Fs5 , v076
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 , v072
-	.byte	W02
-	.byte		PAN   , c_v-16
-	.byte	W01
-	.byte		N02   , Dn6 , v068
-	.byte	W02
-	.byte		        Cs6 , v064
-	.byte	W03
-	.byte		        An5 , v060
-	.byte	W02
-	.byte		        Fs5 , v056
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 , v052
-	.byte	W02
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_excellent_2:
-	.byte	KEYSH , se_rg_excellent_key+0
-	.byte		VOICE , 53
-	.byte		BENDR , 2
-	.byte		VOL   , 43*se_rg_excellent_mvl/mxv
-	.byte		BEND  , c_v+15
-	.byte		N02   , An6 , v112
-	.byte	W02
-	.byte		        Fs6 
-	.byte	W01
-	.byte	W01
-	.byte		        Dn6 
-	.byte	W02
-	.byte	W01
-	.byte		        Cs6 
-	.byte	W02
-	.byte		        An5 
-	.byte	W03
-	.byte		N02   
-	.byte	W02
-	.byte		        Fs5 , v104
-	.byte	W01
-	.byte	W01
-	.byte		        Dn5 , v100
-	.byte	W02
-	.byte	W01
-	.byte		        Cs5 , v096
-	.byte	W02
-	.byte		        An4 , v092
-	.byte	W03
-	.byte		        An6 , v088
-	.byte	W02
-	.byte		        Fs6 , v084
-	.byte	W01
-	.byte	W01
-	.byte		        Dn6 , v080
-	.byte	W02
-	.byte	W01
-	.byte		        Cs6 , v076
-	.byte	W02
-	.byte		        An5 , v072
-	.byte	W03
-	.byte		        An6 , v068
-	.byte	W02
-	.byte		        Fs6 , v064
-	.byte	W01
-	.byte	W01
-	.byte		        Dn6 , v060
-	.byte	W02
-	.byte	W01
-	.byte		        Cs6 , v056
-	.byte	W02
-	.byte		        An5 , v052
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_excellent:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_excellent_pri	@ Priority
-	.byte	se_rg_excellent_rev	@ Reverb.
-
-	.word	se_rg_excellent_grp
-
-	.word	se_rg_excellent_1
-	.word	se_rg_excellent_2
-
-	.end

From 3eff7efd8f0e5dc27ddf8c7c90a8fa1b287a933d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:23:09 -0500
Subject: [PATCH 27/53] Match se_rg_getting.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index af50e003e..b7516fc1e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -869,7 +869,7 @@ SECTIONS {
         sound/songs/midi/se_rg_card3.o(.rodata);
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
-        sound/songs/se_rg_getting.o(.rodata);
+        sound/songs/midi/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
         sound/songs/se_rg_kiteki.o(.rodata);
         sound/songs/se_rg_help_op.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 3a85d7e51..7cef3a33c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1029,5 +1029,8 @@ $(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
+$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 9b4564e22..8a6a675c9 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -255,7 +255,7 @@ gSongTable:: @ 86B49F0
 	song se_rg_card3, 1, 1          @ Trainer Card 3 (FRLG)
 	song se_rg_bag1, 1, 1           @ Bag Scroll (FRLG)
 	song se_rg_bag2, 1, 1           @ Bag Pocket Change (FRLG)
-	song se_rg_getting, 1, 1        
+	song se_rg_getting, 1, 1
 	song se_rg_shop, 1, 1           @ Cash Register (FRLG)
 	song se_rg_kiteki, 1, 1         @ S.S. Anne Horn (FRLG)
 	song se_rg_help_op, 1, 1        @ Help Menu Open (FRLG)
diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_getting.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f8bf4b38fd602d2d96ef4859264c9afd6a517625
GIT binary patch
literal 119
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10Si`ohETU!MUgrOj}FnPGz*
z2ZJmJgB&M_WUps<z~I0z!M%d1!JUC^f=@kDgAW5YLW?lN!8(SG?DZ@Y4JsHL4HyJ~
FQUI4o8ZrO?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_getting.s b/sound/songs/se_rg_getting.s
deleted file mode 100644
index 2c632f399..000000000
--- a/sound/songs/se_rg_getting.s
+++ /dev/null
@@ -1,69 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_getting_grp, voicegroup129
-	.equ	se_rg_getting_pri, 5
-	.equ	se_rg_getting_rev, reverb_set+50
-	.equ	se_rg_getting_mvl, 127
-	.equ	se_rg_getting_key, 0
-	.equ	se_rg_getting_tbs, 1
-	.equ	se_rg_getting_exg, 0
-	.equ	se_rg_getting_cmp, 1
-
-	.section .rodata
-	.global	se_rg_getting
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_getting_1:
-	.byte	KEYSH , se_rg_getting_key+0
-	.byte	TEMPO , 310*se_rg_getting_tbs/2
-	.byte		VOICE , 3
-	.byte		XCMD  , xIECV , 8
-	.byte		        xIECL , 8
-	.byte		VOL   , 100*se_rg_getting_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Bn3 , v120
-	.byte	W03
-	.byte	W03
-	.byte	W02
-	.byte		        En4 , v127
-	.byte	W01
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_getting_2:
-	.byte	KEYSH , se_rg_getting_key+0
-	.byte		VOICE , 126
-	.byte		VOL   , 100*se_rg_getting_mvl/mxv
-	.byte	W03
-	.byte	W01
-	.byte		N01   , Cn2 , v120
-	.byte	W02
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_getting:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_getting_pri	@ Priority
-	.byte	se_rg_getting_rev	@ Reverb.
-
-	.word	se_rg_getting_grp
-
-	.word	se_rg_getting_1
-	.word	se_rg_getting_2
-
-	.end

From 7746acfb1d1f840f85a67d476a11a57767552701 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:27:09 -0500
Subject: [PATCH 28/53] Match se_rg_help_cl.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/se_rg_help_cl.mid | Bin 0 -> 233 bytes
 sound/songs/se_rg_help_cl.s        |  82 -----------------------------
 4 files changed, 4 insertions(+), 83 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_help_cl.mid
 delete mode 100644 sound/songs/se_rg_help_cl.s

diff --git a/ld_script.txt b/ld_script.txt
index b7516fc1e..05d0508f6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -873,7 +873,7 @@ SECTIONS {
         sound/songs/se_rg_shop.o(.rodata);
         sound/songs/se_rg_kiteki.o(.rodata);
         sound/songs/se_rg_help_op.o(.rodata);
-        sound/songs/se_rg_help_cl.o(.rodata);
+        sound/songs/midi/se_rg_help_cl.o(.rodata);
         sound/songs/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
         sound/songs/midi/se_rg_excellent.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 7cef3a33c..01fc89933 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1032,5 +1032,8 @@ $(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
 
+$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_cl.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c2c2612525dced02ff1ea17c99e8f42101353f64
GIT binary patch
literal 233
zcmYk0O$x#=5QU#H_*04qD#V=!5POf11_PzIaM6Ve!Hsx<_6RvjmoB|o`Wk|C_sutt
zH&a&62Y>};5Kv|Hd2!ky+@ut0h2ZAmvPLM7R$u%S`okIf9LpBj8@|5Fu7>C{kWYyl
zc-P3zjlLz*N2a&T+myHTk+1NE-lV*tk9>sJ?9s_<`pCTXXZGvu#OIT|9C^e42UsID
AE&u=k

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_help_cl.s b/sound/songs/se_rg_help_cl.s
deleted file mode 100644
index 8daa70ae9..000000000
--- a/sound/songs/se_rg_help_cl.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_cl_grp, voicegroup129
-	.equ	se_rg_help_cl_pri, 5
-	.equ	se_rg_help_cl_rev, reverb_set+50
-	.equ	se_rg_help_cl_mvl, 127
-	.equ	se_rg_help_cl_key, 0
-	.equ	se_rg_help_cl_tbs, 1
-	.equ	se_rg_help_cl_exg, 0
-	.equ	se_rg_help_cl_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_cl
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_cl_1:
-	.byte	KEYSH , se_rg_help_cl_key+0
-	.byte	TEMPO , 420*se_rg_help_cl_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 95*se_rg_help_cl_mvl/mxv
-	.byte		PAN   , c_v+48
-	.byte		N04   , Dn5 , v092
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , An4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , An4 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , Fs4 , v092
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		PAN   , c_v+16
-	.byte		N04   , En4 , v092
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , En4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-39
-	.byte		N04   , Dn4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn4 , v016
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v012
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn4 , v004
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_cl:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_cl_pri	@ Priority
-	.byte	se_rg_help_cl_rev	@ Reverb.
-
-	.word	se_rg_help_cl_grp
-
-	.word	se_rg_help_cl_1
-
-	.end

From 76cb44666164d9b5159d7f700502e09415f0dff1 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:29:26 -0500
Subject: [PATCH 29/53] Match se_rg_help_ng.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/se_rg_help_cl.mid | Bin 233 -> 233 bytes
 sound/songs/midi/se_rg_help_ng.mid | Bin 0 -> 155 bytes
 sound/songs/se_rg_help_ng.s        |  64 -----------------------------
 5 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_help_ng.mid
 delete mode 100644 sound/songs/se_rg_help_ng.s

diff --git a/ld_script.txt b/ld_script.txt
index 05d0508f6..27acfeb2e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -874,7 +874,7 @@ SECTIONS {
         sound/songs/se_rg_kiteki.o(.rodata);
         sound/songs/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
-        sound/songs/se_rg_help_ng.o(.rodata);
+        sound/songs/midi/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
         sound/songs/midi/se_rg_excellent.o(.rodata);
         sound/songs/se_rg_nawamiss.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 01fc89933..b66808c49 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1035,5 +1035,8 @@ $(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
 
+$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_cl.mid
index c2c2612525dced02ff1ea17c99e8f42101353f64..09b151631c15905889067c9f53871f1028c24f6a 100644
GIT binary patch
delta 11
ScmaFK_>ysg6eHtA>2m-Xodf#-

delta 11
ScmaFK_>ysg6eG(->2m-XsRRB1

diff --git a/sound/songs/midi/se_rg_help_ng.mid b/sound/songs/midi/se_rg_help_ng.mid
new file mode 100644
index 0000000000000000000000000000000000000000..f9597632aac87c6267e2564bcc853113a83032f6
GIT binary patch
literal 155
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(&J?Kug?IL%3?Sm!LUJ8
zhe3pgfy;q`J&9q0R|QLh7X#A<E(Rc50m`;#nBbSd(%=UYuLrV$;z0I+7={fXT|g1t
e0+t3{2DS~19842*BiMj!pqK=h-oVHJvJn7`QXv8W

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_help_ng.s b/sound/songs/se_rg_help_ng.s
deleted file mode 100644
index f430c245a..000000000
--- a/sound/songs/se_rg_help_ng.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_ng_grp, voicegroup129
-	.equ	se_rg_help_ng_pri, 5
-	.equ	se_rg_help_ng_rev, reverb_set+50
-	.equ	se_rg_help_ng_mvl, 127
-	.equ	se_rg_help_ng_key, 0
-	.equ	se_rg_help_ng_tbs, 1
-	.equ	se_rg_help_ng_exg, 0
-	.equ	se_rg_help_ng_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_ng
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_ng_1:
-	.byte	KEYSH , se_rg_help_ng_key+0
-	.byte	TEMPO , 420*se_rg_help_ng_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 96*se_rg_help_ng_mvl/mxv
-	.byte		N04   , Dn4 , v120
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-1
-	.byte		N04   , Fs4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		VOICE , 92
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 125*se_rg_help_ng_mvl/mxv
-	.byte		N04   , An1 , v112
-	.byte	W10
-	.byte		MOD   , 8
-	.byte	W02
-	.byte		N06   , An1 , v088
-	.byte	W06
-	.byte		        An1 , v024
-	.byte	W06
-	.byte		MOD   , 0
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_ng:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_ng_pri	@ Priority
-	.byte	se_rg_help_ng_rev	@ Reverb.
-
-	.word	se_rg_help_ng_grp
-
-	.word	se_rg_help_ng_1
-
-	.end

From 1f8954115f5f0c52ee0c42fef3485289c196fd00 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:30:56 -0500
Subject: [PATCH 30/53] Match se_rg_help_op.mid

---
 ld_script.txt                      |   2 +-
 songs.mk                           |   3 ++
 sound/songs/midi/se_rg_help_op.mid | Bin 0 -> 233 bytes
 sound/songs/se_rg_help_op.s        |  82 -----------------------------
 4 files changed, 4 insertions(+), 83 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_help_op.mid
 delete mode 100644 sound/songs/se_rg_help_op.s

diff --git a/ld_script.txt b/ld_script.txt
index 27acfeb2e..094b2df61 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -872,7 +872,7 @@ SECTIONS {
         sound/songs/midi/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
         sound/songs/se_rg_kiteki.o(.rodata);
-        sound/songs/se_rg_help_op.o(.rodata);
+        sound/songs/midi/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
         sound/songs/midi/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b66808c49..d2d402a99 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1038,5 +1038,8 @@ $(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
 
+$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_help_op.mid b/sound/songs/midi/se_rg_help_op.mid
new file mode 100644
index 0000000000000000000000000000000000000000..79b6c53a8345f14ada604acff6ca3d8388c35a0b
GIT binary patch
literal 233
zcmYk$F$%&k0EOY#7_=6Vf(jXXfTEtG*g~KQjvX8Xw_cz<LXOhW(VNBBkRjWjFOQJ6
zf4=~1kwHMU{rKVO1pkzoP&vHbi0dByhIsYGPhq*#I3KW^P?T`ZAm;{RDZs8`S8yG@
vTYX~FL(?@~$GxV9zQY;1iF-p2J;2$AoNe4&dT73BRpMphdE#>IBme&g%KtQD

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_help_op.s b/sound/songs/se_rg_help_op.s
deleted file mode 100644
index 8bffb7938..000000000
--- a/sound/songs/se_rg_help_op.s
+++ /dev/null
@@ -1,82 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_help_op_grp, voicegroup129
-	.equ	se_rg_help_op_pri, 5
-	.equ	se_rg_help_op_rev, reverb_set+50
-	.equ	se_rg_help_op_mvl, 127
-	.equ	se_rg_help_op_key, 0
-	.equ	se_rg_help_op_tbs, 1
-	.equ	se_rg_help_op_exg, 0
-	.equ	se_rg_help_op_cmp, 1
-
-	.section .rodata
-	.global	se_rg_help_op
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_help_op_1:
-	.byte	KEYSH , se_rg_help_op_key+0
-	.byte	TEMPO , 420*se_rg_help_op_tbs/2
-	.byte		VOICE , 24
-	.byte		LFOS  , 44
-	.byte		BENDR , 12
-	.byte		VOL   , 96*se_rg_help_op_mvl/mxv
-	.byte		PAN   , c_v-48
-	.byte		N04   , Dn4 , v096
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-32
-	.byte		N04   , Fs4 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Fs4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-32
-	.byte		N04   , An4 , v096
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , An4 , v032
-	.byte	W06
-	.byte		PAN   , c_v-16
-	.byte		N04   , Cs5 , v096
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Cs5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+32
-	.byte		N04   , Dn5 , v076
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v032
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn5 , v024
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v016
-	.byte	W06
-	.byte		PAN   , c_v+63
-	.byte		N04   , Dn5 , v008
-	.byte	W06
-	.byte		PAN   , c_v-64
-	.byte		N04   , Dn5 , v004
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_help_op:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_help_op_pri	@ Priority
-	.byte	se_rg_help_op_rev	@ Reverb.
-
-	.word	se_rg_help_op_grp
-
-	.word	se_rg_help_op_1
-
-	.end

From f7959dff52d0618b2ff7d6142831056075f3868e Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:33:07 -0500
Subject: [PATCH 31/53] Match se_rg_kiteki.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 +
 sound/songs/midi/se_rg_kiteki.mid | Bin 0 -> 289 bytes
 sound/songs/se_rg_kiteki.s        | 161 ------------------------------
 4 files changed, 4 insertions(+), 162 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_kiteki.mid
 delete mode 100644 sound/songs/se_rg_kiteki.s

diff --git a/ld_script.txt b/ld_script.txt
index 094b2df61..0b404fba4 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -871,7 +871,7 @@ SECTIONS {
         sound/songs/midi/se_rg_bag2.o(.rodata);
         sound/songs/midi/se_rg_getting.o(.rodata);
         sound/songs/se_rg_shop.o(.rodata);
-        sound/songs/se_rg_kiteki.o(.rodata);
+        sound/songs/midi/se_rg_kiteki.o(.rodata);
         sound/songs/midi/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
         sound/songs/midi/se_rg_help_ng.o(.rodata);
diff --git a/songs.mk b/songs.mk
index d2d402a99..cdf05ee6c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1041,5 +1041,8 @@ $(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
 
+$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_kiteki.mid b/sound/songs/midi/se_rg_kiteki.mid
new file mode 100644
index 0000000000000000000000000000000000000000..07e19663ab2da4c1b71f25d626dd671aeec1cb21
GIT binary patch
literal 289
zcmYL@F-ikr6olvBtn=1MP>HK<qXsMt7&JwMl-mV_pn(Y5sD;I%MZ^pI<_21L0B^8+
z13lU1UlgpqH@x>|W;!n(0T2!?WYhWUb5Pr;Z(<i^3F=vE?Q<XX8U9vZ_+CeucCa&m
za+rs6cpv%rZG^x=foZ8`_DQL&M7>1AL^*Xu-BT}=&$OTl>W;dg&Z%SSfZCvt*%Q>E
zJwSW3Yv_nJflg^TbV(aSx3m+eh^!aeF0_cP9X08tf&WD(_?e*!72PJn??>Oq%RT}N
c1*SnSv&zP_VX&ixm_u4h>(bh6E~{U=6>6p~>;M1&

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_kiteki.s b/sound/songs/se_rg_kiteki.s
deleted file mode 100644
index 248ddc303..000000000
--- a/sound/songs/se_rg_kiteki.s
+++ /dev/null
@@ -1,161 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_kiteki_grp, voicegroup129
-	.equ	se_rg_kiteki_pri, 5
-	.equ	se_rg_kiteki_rev, reverb_set+50
-	.equ	se_rg_kiteki_mvl, 127
-	.equ	se_rg_kiteki_key, 0
-	.equ	se_rg_kiteki_tbs, 1
-	.equ	se_rg_kiteki_exg, 0
-	.equ	se_rg_kiteki_cmp, 1
-
-	.section .rodata
-	.global	se_rg_kiteki
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_kiteki_1:
-	.byte	KEYSH , se_rg_kiteki_key+0
-	.byte	TEMPO , 164*se_rg_kiteki_tbs/2
-	.byte		VOICE , 9
-	.byte		BENDR , 12
-	.byte		LFOS  , 44
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 96*se_rg_kiteki_mvl/mxv
-	.byte		MOD   , 1
-	.byte		N04   , En2 , v127
-	.byte	W04
-	.byte		N10   , En2 , v104
-	.byte	W20
-	.byte	W10
-	.byte		PAN   , c_v-64
-	.byte		TIE   , En2 , v127
-	.byte	W08
-	.byte		PAN   , c_v-48
-	.byte	W06
-	.byte	W02
-	.byte		        c_v-32
-	.byte	W08
-	.byte		        c_v-16
-	.byte	W08
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v+16
-	.byte	W06
-	.byte		        c_v+31
-	.byte	W06
-	.byte		        c_v+48
-	.byte	W06
-	.byte		        c_v+63
-	.byte	W06
-	.byte	W18
-	.byte		        c_v+47
-	.byte	W06
-	.byte		        c_v+40
-	.byte	W06
-	.byte		        c_v+30
-	.byte	W06
-	.byte		        c_v+10
-	.byte	W06
-	.byte		        c_v-11
-	.byte	W06
-	.byte		        c_v-25
-	.byte	W06
-	.byte		        c_v-34
-	.byte	W06
-	.byte		        c_v-50
-	.byte	W06
-	.byte		        c_v-64
-	.byte	W06
-	.byte	W18
-	.byte		VOL   , 80*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-52
-	.byte	W06
-	.byte		VOL   , 72*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-41
-	.byte	W06
-	.byte		VOL   , 64*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-29
-	.byte	W06
-	.byte		VOL   , 53*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v-18
-	.byte	W06
-	.byte		VOL   , 48*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+15
-	.byte	W06
-	.byte		VOL   , 42*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+25
-	.byte	W06
-	.byte		VOL   , 32*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+40
-	.byte	W02
-	.byte		VOL   , 24*se_rg_kiteki_mvl/mxv
-	.byte	W04
-	.byte		        16*se_rg_kiteki_mvl/mxv
-	.byte		PAN   , c_v+47
-	.byte	W04
-	.byte		VOL   , 8*se_rg_kiteki_mvl/mxv
-	.byte	W02
-	.byte		EOT   
-	.byte		VOL   , 0*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_kiteki_2:
-	.byte	KEYSH , se_rg_kiteki_key+0
-	.byte		VOICE , 81
-	.byte		PAN   , c_v+0
-	.byte		MOD   , 15
-	.byte		VOL   , 48*se_rg_kiteki_mvl/mxv
-	.byte		N04   , En1 , v127
-	.byte	W04
-	.byte		N10   , En1 , v104
-	.byte	W20
-	.byte	W10
-	.byte		TIE   , En1 , v127
-	.byte	W14
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W24
-	.byte	W18
-	.byte		VOL   , 42*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        36*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        32*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        26*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        23*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        15*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        13*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		        8*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte		VOL   , 0*se_rg_kiteki_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_kiteki:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_kiteki_pri	@ Priority
-	.byte	se_rg_kiteki_rev	@ Reverb.
-
-	.word	se_rg_kiteki_grp
-
-	.word	se_rg_kiteki_1
-	.word	se_rg_kiteki_2
-
-	.end

From 5e9076990e2089982bcbdc9fadfc91b84d187d45 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:35:18 -0500
Subject: [PATCH 32/53] Match se_rg_nawamiss.mid

---
 ld_script.txt                       |   2 +-
 songs.mk                            |   3 ++
 sound/songs/midi/se_rg_nawamiss.mid | Bin 0 -> 99 bytes
 sound/songs/se_rg_nawamiss.s        |  55 ----------------------------
 4 files changed, 4 insertions(+), 56 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_nawamiss.mid
 delete mode 100644 sound/songs/se_rg_nawamiss.s

diff --git a/ld_script.txt b/ld_script.txt
index 0b404fba4..46cb47800 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -877,7 +877,7 @@ SECTIONS {
         sound/songs/midi/se_rg_help_ng.o(.rodata);
         sound/songs/midi/se_rg_deomov.o(.rodata);
         sound/songs/midi/se_rg_excellent.o(.rodata);
-        sound/songs/se_rg_nawamiss.o(.rodata);
+        sound/songs/midi/se_rg_nawamiss.o(.rodata);
         sound/songs/se_toreeye.o(.rodata);
         sound/songs/se_toreoff.o(.rodata);
         sound/songs/midi/se_hantei1.o(.rodata);
diff --git a/songs.mk b/songs.mk
index cdf05ee6c..4fed6d158 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1044,5 +1044,8 @@ $(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
 
+$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_nawamiss.mid b/sound/songs/midi/se_rg_nawamiss.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c3c52f88fa538a55b52b328f130600f564b91148
GIT binary patch
literal 99
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SizA%B|zdi$0%821W48sNy
h9tQS$h6fA|3=<6MnHvlkfV2pdt`~yxIYBf~Cjb_975o4I

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_nawamiss.s b/sound/songs/se_rg_nawamiss.s
deleted file mode 100644
index db24cf5f4..000000000
--- a/sound/songs/se_rg_nawamiss.s
+++ /dev/null
@@ -1,55 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_nawamiss_grp, voicegroup127
-	.equ	se_rg_nawamiss_pri, 5
-	.equ	se_rg_nawamiss_rev, reverb_set+50
-	.equ	se_rg_nawamiss_mvl, 127
-	.equ	se_rg_nawamiss_key, 0
-	.equ	se_rg_nawamiss_tbs, 1
-	.equ	se_rg_nawamiss_exg, 0
-	.equ	se_rg_nawamiss_cmp, 1
-
-	.section .rodata
-	.global	se_rg_nawamiss
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_nawamiss_1:
-	.byte	KEYSH , se_rg_nawamiss_key+0
-	.byte	TEMPO , 240*se_rg_nawamiss_tbs/2
-	.byte		VOICE , 92
-	.byte		BENDR , 12
-	.byte		VOL   , 127*se_rg_nawamiss_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Cn2 , v127
-	.byte	W03
-	.byte		        Cn2 , v020
-	.byte	W03
-	.byte		N18   , Cn2 , v127
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte		N09   , Cn2 , v020
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_nawamiss:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_nawamiss_pri	@ Priority
-	.byte	se_rg_nawamiss_rev	@ Reverb.
-
-	.word	se_rg_nawamiss_grp
-
-	.word	se_rg_nawamiss_1
-
-	.end

From a5ddb0b4b8f098aaa29995f31e24845b2bce7647 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:37:10 -0500
Subject: [PATCH 33/53] Match se_rg_shop.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 +++
 sound/songs/midi/se_rg_shop.mid | Bin 0 -> 75 bytes
 sound/songs/se_rg_shop.s        |  46 --------------------------------
 4 files changed, 4 insertions(+), 47 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_shop.mid
 delete mode 100644 sound/songs/se_rg_shop.s

diff --git a/ld_script.txt b/ld_script.txt
index 46cb47800..a12e90a7b 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -870,7 +870,7 @@ SECTIONS {
         sound/songs/midi/se_rg_bag1.o(.rodata);
         sound/songs/midi/se_rg_bag2.o(.rodata);
         sound/songs/midi/se_rg_getting.o(.rodata);
-        sound/songs/se_rg_shop.o(.rodata);
+        sound/songs/midi/se_rg_shop.o(.rodata);
         sound/songs/midi/se_rg_kiteki.o(.rodata);
         sound/songs/midi/se_rg_help_op.o(.rodata);
         sound/songs/midi/se_rg_help_cl.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4fed6d158..e104c6730 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1047,5 +1047,8 @@ $(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
 
+$(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_shop.mid b/sound/songs/midi/se_rg_shop.mid
new file mode 100644
index 0000000000000000000000000000000000000000..81ade1a6362ae7c76b6d3ae95326c6ff06423c1d
GIT binary patch
literal 75
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10SiPm*K!ug?ILl43Z(!LWh7
Wo`K7O;Q@mK!vvcOxds~skO}}Gau4(X

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_shop.s b/sound/songs/se_rg_shop.s
deleted file mode 100644
index d184e1e5d..000000000
--- a/sound/songs/se_rg_shop.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_shop_grp, voicegroup129
-	.equ	se_rg_shop_pri, 5
-	.equ	se_rg_shop_rev, reverb_set+50
-	.equ	se_rg_shop_mvl, 127
-	.equ	se_rg_shop_key, 0
-	.equ	se_rg_shop_tbs, 1
-	.equ	se_rg_shop_exg, 0
-	.equ	se_rg_shop_cmp, 1
-
-	.section .rodata
-	.global	se_rg_shop
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_shop_1:
-	.byte	KEYSH , se_rg_shop_key+0
-	.byte	TEMPO , 124*se_rg_shop_tbs/2
-	.byte		VOICE , 8
-	.byte		VOL   , 80*se_rg_shop_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N30   , Cn3 , v120
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_shop:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_shop_pri	@ Priority
-	.byte	se_rg_shop_rev	@ Reverb.
-
-	.word	se_rg_shop_grp
-
-	.word	se_rg_shop_1
-
-	.end

From 83c843474a8a890b2e379657d081067cc0be910e Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:40:34 -0500
Subject: [PATCH 34/53] Match se_rg_w_door.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_rg_w_door.mid | Bin 0 -> 168 bytes
 sound/songs/se_rg_w_door.s        |  84 ------------------------------
 4 files changed, 4 insertions(+), 85 deletions(-)
 create mode 100644 sound/songs/midi/se_rg_w_door.mid
 delete mode 100644 sound/songs/se_rg_w_door.s

diff --git a/ld_script.txt b/ld_script.txt
index a12e90a7b..d092bbeb0 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -863,7 +863,7 @@ SECTIONS {
         sound/songs/se_w287b.o(.rodata);
         sound/songs/se_w114.o(.rodata);
         sound/songs/se_w063b.o(.rodata);
-        sound/songs/se_rg_w_door.o(.rodata);
+        sound/songs/midi/se_rg_w_door.o(.rodata);
         sound/songs/midi/se_rg_card1.o(.rodata);
         sound/songs/midi/se_rg_card2.o(.rodata);
         sound/songs/midi/se_rg_card3.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e104c6730..df0cb1de9 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1050,5 +1050,8 @@ $(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
 
+$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_rg_w_door.mid b/sound/songs/midi/se_rg_w_door.mid
new file mode 100644
index 0000000000000000000000000000000000000000..e0b6ba957cef014e9eef23f2e25f6b9a40e74d5a
GIT binary patch
literal 168
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdGD~nU{10U22wKPRU!MUgrNeNbo?!!f
zJ;Mak6b7q$<_1#+1}g^U2~G)Y8`uk&8k`syH?X@hvxl=G^f)sdjA7U)!o$FB&hU`I
zfrWvOVPd=q(?bSfMg~nr20KQEFh+(LMutqrjqIvG6{U;}HH?k%3_z|pkXz3QGztLg
CV<e6M

literal 0
HcmV?d00001

diff --git a/sound/songs/se_rg_w_door.s b/sound/songs/se_rg_w_door.s
deleted file mode 100644
index 9c2349018..000000000
--- a/sound/songs/se_rg_w_door.s
+++ /dev/null
@@ -1,84 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_rg_w_door_grp, voicegroup129
-	.equ	se_rg_w_door_pri, 5
-	.equ	se_rg_w_door_rev, reverb_set+50
-	.equ	se_rg_w_door_mvl, 127
-	.equ	se_rg_w_door_key, 0
-	.equ	se_rg_w_door_tbs, 1
-	.equ	se_rg_w_door_exg, 0
-	.equ	se_rg_w_door_cmp, 1
-
-	.section .rodata
-	.global	se_rg_w_door
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_rg_w_door_1:
-	.byte	KEYSH , se_rg_w_door_key+0
-	.byte	TEMPO , 110*se_rg_w_door_tbs/2
-	.byte		VOICE , 127
-	.byte		VOL   , 100*se_rg_w_door_mvl/mxv
-	.byte		N03   , Fn2 , v100
-	.byte		N03   , As2 , v127
-	.byte	W06
-	.byte		N08   , Fs3 , v096
-	.byte	W06
-	.byte		VOL   , 88*se_rg_w_door_mvl/mxv
-	.byte	W03
-	.byte		        54*se_rg_w_door_mvl/mxv
-	.byte	W03
-	.byte		        68*se_rg_w_door_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_rg_w_door_2:
-	.byte	KEYSH , se_rg_w_door_key+0
-	.byte		VOICE , 92
-	.byte		BENDR , 12
-	.byte		VOL   , 43*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W04
-	.byte		        c_v-50
-	.byte		N10   , Bn5 , v052
-	.byte	W02
-	.byte		BEND  , c_v-45
-	.byte	W01
-	.byte		        c_v-23
-	.byte	W01
-	.byte		        c_v-2
-	.byte	W01
-	.byte		        c_v+22
-	.byte	W01
-	.byte		        c_v+28
-	.byte	W01
-	.byte		        c_v+41
-	.byte	W01
-	.byte		VOL   , 29*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+53
-	.byte	W01
-	.byte		        c_v+60
-	.byte	W02
-	.byte		VOL   , 18*se_rg_w_door_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W09
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_rg_w_door:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_rg_w_door_pri	@ Priority
-	.byte	se_rg_w_door_rev	@ Reverb.
-
-	.word	se_rg_w_door_grp
-
-	.word	se_rg_w_door_1
-	.word	se_rg_w_door_2
-
-	.end

From 410492dea9d67fd84286ae5955bd3e4f48c692aa Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:42:11 -0500
Subject: [PATCH 35/53] Match se_ru_bari.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_ru_bari.mid | Bin 0 -> 142 bytes
 sound/songs/se_ru_bari.s        |  64 --------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_ru_bari.mid
 delete mode 100644 sound/songs/se_ru_bari.s

diff --git a/ld_script.txt b/ld_script.txt
index d092bbeb0..14f0be417 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -657,7 +657,7 @@ SECTIONS {
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
         sound/songs/se_ru_gashin.o(.rodata);
         sound/songs/se_ru_gasyan.o(.rodata);
-        sound/songs/se_ru_bari.o(.rodata);
+        sound/songs/midi/se_ru_bari.o(.rodata);
         sound/songs/se_ru_hyuu.o(.rodata);
         sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/se_tk_warpin.o(.rodata);
diff --git a/songs.mk b/songs.mk
index df0cb1de9..6891acd9b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1053,5 +1053,8 @@ $(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
 $(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
 
+$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ru_bari.mid
new file mode 100644
index 0000000000000000000000000000000000000000..14b1991e655510e8b2c8c22ddc744d8a07847f60
GIT binary patch
literal 142
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10SilWJi2ug?IL(q}lp$*_UF
zp5Xz51H**q2*!qJ1{lpaA;E*OA%THuLV^XDMrc!GI9SE75vXmVc>!aiIRoRtYQ~8H
S35<;a3``RPfI>hTs2Tw3rXtS(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ru_bari.s b/sound/songs/se_ru_bari.s
deleted file mode 100644
index ffff1b406..000000000
--- a/sound/songs/se_ru_bari.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_bari_grp, voicegroup127
-	.equ	se_ru_bari_pri, 4
-	.equ	se_ru_bari_rev, reverb_set+50
-	.equ	se_ru_bari_mvl, 127
-	.equ	se_ru_bari_key, 0
-	.equ	se_ru_bari_tbs, 1
-	.equ	se_ru_bari_exg, 0
-	.equ	se_ru_bari_cmp, 1
-
-	.section .rodata
-	.global	se_ru_bari
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_bari_1:
-	.byte	KEYSH , se_ru_bari_key+0
-	.byte	TEMPO , 150*se_ru_bari_tbs/2
-	.byte		VOICE , 9
-	.byte		VOL   , 100*se_ru_bari_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn5 , v088
-	.byte	W01
-	.byte		N01   
-	.byte	W02
-	.byte		        Cn6 , v072
-	.byte	W03
-	.byte		        Cn6 , v056
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_bari_2:
-	.byte	KEYSH , se_ru_bari_key+0
-	.byte		VOICE , 122
-	.byte		VOL   , 100*se_ru_bari_mvl/mxv
-	.byte		N01   , Gn2 , v112
-	.byte	W02
-	.byte		VOICE , 123
-	.byte	W01
-	.byte		N01   , Gs4 , v096
-	.byte	W03
-	.byte		        Gs4 , v112
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_bari:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_bari_pri	@ Priority
-	.byte	se_ru_bari_rev	@ Reverb.
-
-	.word	se_ru_bari_grp
-
-	.word	se_ru_bari_1
-	.word	se_ru_bari_2
-
-	.end

From 80ea58a198603820e887572341bb56b3b1ba0c4e Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:44:09 -0500
Subject: [PATCH 36/53] Match se_ru_gashin.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_ru_gashin.mid | Bin 0 -> 122 bytes
 sound/songs/se_ru_gashin.s        |  64 ------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_ru_gashin.mid
 delete mode 100644 sound/songs/se_ru_gashin.s

diff --git a/ld_script.txt b/ld_script.txt
index 14f0be417..f7dbccf45 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -655,7 +655,7 @@ SECTIONS {
         sound/songs/midi/se_fu_zaku.o(.rodata);
         sound/songs/midi/se_fu_zaku2.o(.rodata);
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
-        sound/songs/se_ru_gashin.o(.rodata);
+        sound/songs/midi/se_ru_gashin.o(.rodata);
         sound/songs/se_ru_gasyan.o(.rodata);
         sound/songs/midi/se_ru_bari.o(.rodata);
         sound/songs/se_ru_hyuu.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 6891acd9b..25e0f9ff1 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1056,5 +1056,8 @@ $(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
 $(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
+$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ru_gashin.mid
new file mode 100644
index 0000000000000000000000000000000000000000..ae29a385b6c280860c67c4c9e8ee041e5f39541a
GIT binary patch
literal 122
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPf_+{10SilWJi2ug?ILQe!y4%&>vI
zp5XyQ0K)`_0>%dnX^aeYj13M9j1znccp7{dm=LO^84j{AYy_&F=#s$P=)%A_F(84b
IF#xOt0976wi~s-t

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ru_gashin.s b/sound/songs/se_ru_gashin.s
deleted file mode 100644
index 1c9158cbd..000000000
--- a/sound/songs/se_ru_gashin.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_gashin_grp, voicegroup128
-	.equ	se_ru_gashin_pri, 4
-	.equ	se_ru_gashin_rev, reverb_set+50
-	.equ	se_ru_gashin_mvl, 127
-	.equ	se_ru_gashin_key, 0
-	.equ	se_ru_gashin_tbs, 1
-	.equ	se_ru_gashin_exg, 0
-	.equ	se_ru_gashin_cmp, 1
-
-	.section .rodata
-	.global	se_ru_gashin
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_gashin_1:
-	.byte	KEYSH , se_ru_gashin_key+0
-	.byte	TEMPO , 150*se_ru_gashin_tbs/2
-	.byte		VOICE , 3
-	.byte		VOL   , 90*se_ru_gashin_mvl/mxv
-	.byte		BEND  , c_v+16
-	.byte		N03   , En3 , v112
-	.byte	W01
-	.byte		BEND  , c_v+38
-	.byte	W01
-	.byte		        c_v+62
-	.byte	W02
-	.byte		N12   , En4 
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_gashin_2:
-	.byte	KEYSH , se_ru_gashin_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 90*se_ru_gashin_mvl/mxv
-	.byte		N03   , Gs3 , v096
-	.byte	W04
-	.byte		N12   , Gs4 
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_gashin:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_gashin_pri	@ Priority
-	.byte	se_ru_gashin_rev	@ Reverb.
-
-	.word	se_ru_gashin_grp
-
-	.word	se_ru_gashin_1
-	.word	se_ru_gashin_2
-
-	.end

From 98831e29bb0065cc4446c4f0e2ae7266ac918cc3 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:45:44 -0500
Subject: [PATCH 37/53] Match se_ru_gasyan.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_ru_gasyan.mid | Bin 0 -> 184 bytes
 sound/songs/se_ru_gasyan.s        |  83 ------------------------------
 4 files changed, 4 insertions(+), 84 deletions(-)
 create mode 100644 sound/songs/midi/se_ru_gasyan.mid
 delete mode 100644 sound/songs/se_ru_gasyan.s

diff --git a/ld_script.txt b/ld_script.txt
index f7dbccf45..759db90d7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -656,7 +656,7 @@ SECTIONS {
         sound/songs/midi/se_fu_zaku2.o(.rodata);
         sound/songs/midi/se_fu_zuzuzu.o(.rodata);
         sound/songs/midi/se_ru_gashin.o(.rodata);
-        sound/songs/se_ru_gasyan.o(.rodata);
+        sound/songs/midi/se_ru_gasyan.o(.rodata);
         sound/songs/midi/se_ru_bari.o(.rodata);
         sound/songs/se_ru_hyuu.o(.rodata);
         sound/songs/midi/se_ki_gasyan.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 25e0f9ff1..819a73997 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1059,5 +1059,8 @@ $(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
 $(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
+$(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_ru_gasyan.mid b/sound/songs/midi/se_ru_gasyan.mid
new file mode 100644
index 0000000000000000000000000000000000000000..486eabb9be57b7a8b7fede6266d748966370b087
GIT binary patch
literal 184
zcmeYb$w*;fU|?flWMF2H@C_--2J(a%{ztGdvPy6;{10SiU#P(FU!MUg<->4*nPCHa
zJ;MVA2ZjmG6^sqe49pWefV2k#P|SysA&hZCNC9I*2#A}^#E{3xP{uI9BLk#>@c~0U
rP&NT9i!jre;UEjcMxdD!T^tx2T^N|5G~+~HAm5jP3Cd@J@qt<aFdr+?

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ru_gasyan.s b/sound/songs/se_ru_gasyan.s
deleted file mode 100644
index 8cf3f12ea..000000000
--- a/sound/songs/se_ru_gasyan.s
+++ /dev/null
@@ -1,83 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_gasyan_grp, voicegroup128
-	.equ	se_ru_gasyan_pri, 4
-	.equ	se_ru_gasyan_rev, reverb_set+50
-	.equ	se_ru_gasyan_mvl, 127
-	.equ	se_ru_gasyan_key, 0
-	.equ	se_ru_gasyan_tbs, 1
-	.equ	se_ru_gasyan_exg, 0
-	.equ	se_ru_gasyan_cmp, 1
-
-	.section .rodata
-	.global	se_ru_gasyan
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_gasyan_1:
-	.byte	KEYSH , se_ru_gasyan_key+0
-	.byte	TEMPO , 120*se_ru_gasyan_tbs/2
-	.byte		VOICE , 3
-	.byte		VOL   , 100*se_ru_gasyan_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn3 , v120
-	.byte	W03
-	.byte	W01
-	.byte		        Cn4 
-	.byte	W01
-	.byte		BEND  , c_v+12
-	.byte	W01
-	.byte		        c_v+22
-	.byte	W01
-	.byte		N01   , Cn5 , v112
-	.byte	W01
-	.byte		BEND  , c_v+35
-	.byte	W01
-	.byte	W01
-	.byte		        c_v+46
-	.byte	W01
-	.byte		        c_v+54
-	.byte		N01   , Cn4 , v104
-	.byte	W01
-	.byte	W01
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		N01   , Cn5 , v096
-	.byte	W01
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_ru_gasyan_2:
-	.byte	KEYSH , se_ru_gasyan_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 100*se_ru_gasyan_mvl/mxv
-	.byte		N01   , Gs3 , v064
-	.byte	W03
-	.byte	W01
-	.byte		N01   
-	.byte	W02
-	.byte		        Fn4 
-	.byte	W03
-	.byte		        Gs3 
-	.byte	W03
-	.byte		        Fn4 
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_gasyan:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_gasyan_pri	@ Priority
-	.byte	se_ru_gasyan_rev	@ Reverb.
-
-	.word	se_ru_gasyan_grp
-
-	.word	se_ru_gasyan_1
-	.word	se_ru_gasyan_2
-
-	.end

From 3941ce5cf2f5ed8aa91349aead46cf511e08b849 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:47:42 -0500
Subject: [PATCH 38/53] Match se_ru_hyuu.mid

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

diff --git a/ld_script.txt b/ld_script.txt
index 759db90d7..3ecf55dfa 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -658,7 +658,7 @@ SECTIONS {
         sound/songs/midi/se_ru_gashin.o(.rodata);
         sound/songs/midi/se_ru_gasyan.o(.rodata);
         sound/songs/midi/se_ru_bari.o(.rodata);
-        sound/songs/se_ru_hyuu.o(.rodata);
+        sound/songs/midi/se_ru_hyuu.o(.rodata);
         sound/songs/midi/se_ki_gasyan.o(.rodata);
         sound/songs/se_tk_warpin.o(.rodata);
         sound/songs/se_tk_warpout.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 819a73997..218c5c384 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1062,5 +1062,8 @@ $(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
 $(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
+$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 8a6a675c9..42e62b832 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -44,7 +44,7 @@ gSongTable:: @ 86B49F0
 	song se_ru_gashin, 1, 1         @ Sootopolis Gym - Stairs Appear
 	song se_ru_gasyan, 1, 1         @ Sootopolis Gym - Ice Breaking
 	song se_ru_bari, 1, 1           @ Sootopolis Gym - Walking on Ice
-	song se_ru_hyuu, 1, 1           @ Falling Down
+	song se_ru_hyuu, 1, 1           @ Falling Down a Hole
 	song se_ki_gasyan, 2, 2
 	song se_tk_warpin, 1, 1         @ Warp In
 	song se_tk_warpout, 1, 1        @ Warp Out
diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_ru_hyuu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..1adfc92681ff73b92b8920f15135396f7a76bba7
GIT binary patch
literal 162
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPy6;{10SiO<K$FU!MUgRmgBaj9~+N
zJ;MWr8ionZ0n85=Dw!Edm>IH}8B&-T;+Pr2m>B|?H?UU%Rd@sG3?S_cq~n3K1&|H`
m(gr}<8AxjYX%iqV1EjTpG#^ugGXvuWc3vQx5h%t2vKRo3$R%w6

literal 0
HcmV?d00001

diff --git a/sound/songs/se_ru_hyuu.s b/sound/songs/se_ru_hyuu.s
deleted file mode 100644
index cf495141c..000000000
--- a/sound/songs/se_ru_hyuu.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_ru_hyuu_grp, voicegroup128
-	.equ	se_ru_hyuu_pri, 4
-	.equ	se_ru_hyuu_rev, reverb_set+50
-	.equ	se_ru_hyuu_mvl, 127
-	.equ	se_ru_hyuu_key, 0
-	.equ	se_ru_hyuu_tbs, 1
-	.equ	se_ru_hyuu_exg, 0
-	.equ	se_ru_hyuu_cmp, 1
-
-	.section .rodata
-	.global	se_ru_hyuu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_ru_hyuu_1:
-	.byte	KEYSH , se_ru_hyuu_key+0
-	.byte	TEMPO , 170*se_ru_hyuu_tbs/2
-	.byte		VOICE , 22
-	.byte		VOL   , 110*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v+60
-	.byte		N44   , Gn3 , v080
-	.byte	W03
-	.byte		BEND  , c_v+57
-	.byte	W03
-	.byte		        c_v+52
-	.byte	W03
-	.byte		        c_v+43
-	.byte	W03
-	.byte		        c_v+36
-	.byte	W03
-	.byte		        c_v+30
-	.byte	W03
-	.byte		        c_v+22
-	.byte	W03
-	.byte		        c_v+16
-	.byte	W03
-	.byte		VOL   , 104*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v+11
-	.byte	W03
-	.byte		VOL   , 90*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v+3
-	.byte	W03
-	.byte		VOL   , 82*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W03
-	.byte		VOL   , 71*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-16
-	.byte	W03
-	.byte		VOL   , 58*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		VOL   , 45*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-36
-	.byte	W03
-	.byte		VOL   , 36*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-50
-	.byte	W03
-	.byte		VOL   , 11*se_ru_hyuu_mvl/mxv
-	.byte		BEND  , c_v-63
-	.byte	W03
-	.byte		VOL   , 3*se_ru_hyuu_mvl/mxv
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_ru_hyuu:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_ru_hyuu_pri	@ Priority
-	.byte	se_ru_hyuu_rev	@ Reverb.
-
-	.word	se_ru_hyuu_grp
-
-	.word	se_ru_hyuu_1
-
-	.end

From 53ca39a8ac08ae6d8de82a99d23b4f1b81c31942 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:49:15 -0500
Subject: [PATCH 39/53] Match se_save.mid

---
 ld_script.txt                |   2 +-
 songs.mk                     |   3 ++
 sound/songs/midi/se_save.mid | Bin 0 -> 179 bytes
 sound/songs/se_save.s        |  78 -----------------------------------
 4 files changed, 4 insertions(+), 79 deletions(-)
 create mode 100644 sound/songs/midi/se_save.mid
 delete mode 100644 sound/songs/se_save.s

diff --git a/ld_script.txt b/ld_script.txt
index 3ecf55dfa..79cb12e92 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -670,7 +670,7 @@ SECTIONS {
         sound/songs/se_track_door.o(.rodata);
         sound/songs/midi/se_moter.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
-        sound/songs/se_save.o(.rodata);
+        sound/songs/midi/se_save.o(.rodata);
         sound/songs/midi/se_kon.o(.rodata);
         sound/songs/midi/se_kon2.o(.rodata);
         sound/songs/midi/se_kon3.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 218c5c384..c7482de6a 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1065,5 +1065,8 @@ $(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid
 $(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
+$(MID_SUBDIR)/se_save.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_save.mid b/sound/songs/midi/se_save.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5c4b90697b167a12c75c58e788c472958376fa7c
GIT binary patch
literal 179
zcmYk!JqiLb7=+<jvP7!|u?b$n1Eerrsx212!tyIp2zFk;<OZ9Y=neEHdy_ce4_3p=
zz%$Az0kG&`;6}NeSzEMY-}P>dHW|CiXnTCF10Dlzt1A{vn1h-efZ20B_uG*j*`hWJ
jSJh?3ALH@d;7+E7WD1Guxg>ra*(9nYTS!z*uDppCRD~;I

literal 0
HcmV?d00001

diff --git a/sound/songs/se_save.s b/sound/songs/se_save.s
deleted file mode 100644
index eaedd3e7b..000000000
--- a/sound/songs/se_save.s
+++ /dev/null
@@ -1,78 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_save_grp, voicegroup128
-	.equ	se_save_pri, 5
-	.equ	se_save_rev, reverb_set+50
-	.equ	se_save_mvl, 127
-	.equ	se_save_key, 0
-	.equ	se_save_tbs, 1
-	.equ	se_save_exg, 0
-	.equ	se_save_cmp, 1
-
-	.section .rodata
-	.global	se_save
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_save_1:
-	.byte	KEYSH , se_save_key+0
-	.byte	TEMPO , 150*se_save_tbs/2
-	.byte		VOICE , 14
-	.byte		VOL   , 80*se_save_mvl/mxv
-	.byte		BEND  , c_v+17
-	.byte		N03   , En3 , v096
-	.byte	W03
-	.byte		        Bn2 
-	.byte	W03
-	.byte		        En3 
-	.byte	W03
-	.byte		        Bn3 
-	.byte	W03
-	.byte		N06   , Cn5 
-	.byte	W06
-	.byte		N24   , Cn6 
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_save_2:
-	.byte	KEYSH , se_save_key+0
-	.byte		VOICE , 17
-	.byte		VOL   , 80*se_save_mvl/mxv
-	.byte		N03   , En3 , v100
-	.byte	W03
-	.byte		        Bn2 
-	.byte	W03
-	.byte		        En3 
-	.byte	W03
-	.byte		        Bn3 
-	.byte	W03
-	.byte		N06   , Cn5 
-	.byte	W06
-	.byte		N24   , Cn6 
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_save:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_save_pri	@ Priority
-	.byte	se_save_rev	@ Reverb.
-
-	.word	se_save_grp
-
-	.word	se_save_1
-	.word	se_save_2
-
-	.end

From 5e423fb5ea5d8c7416dc705ebe17304bfda89619 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:50:34 -0500
Subject: [PATCH 40/53] Match se_seikai.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 +++
 sound/songs/midi/se_seikai.mid | Bin 0 -> 83 bytes
 sound/songs/se_seikai.s        |  44 ---------------------------------
 4 files changed, 4 insertions(+), 45 deletions(-)
 create mode 100644 sound/songs/midi/se_seikai.mid
 delete mode 100644 sound/songs/se_seikai.s

diff --git a/ld_script.txt b/ld_script.txt
index 79cb12e92..295ec335e 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -646,7 +646,7 @@ SECTIONS {
         sound/songs/midi/se_e.o(.rodata);
         sound/songs/midi/se_o.o(.rodata);
         sound/songs/midi/se_n.o(.rodata);
-        sound/songs/se_seikai.o(.rodata);
+        sound/songs/midi/se_seikai.o(.rodata);
         sound/songs/midi/se_hazure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
         sound/songs/midi/se_jite_pyoko.o(.rodata);
diff --git a/songs.mk b/songs.mk
index c7482de6a..1704e2891 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1068,5 +1068,8 @@ $(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid
 $(MID_SUBDIR)/se_save.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5
 
+$(MID_SUBDIR)/se_seikai.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_seikai.mid
new file mode 100644
index 0000000000000000000000000000000000000000..32bfa07a876942e817f09903f4213d9e27e61235
GIT binary patch
literal 83
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10SizA%B|zdi$0N{QhBE5im6
f9tQS$h6fA|3=^X3*&3o57$$_*3pIo@fK&ni(Qp$b

literal 0
HcmV?d00001

diff --git a/sound/songs/se_seikai.s b/sound/songs/se_seikai.s
deleted file mode 100644
index a3f27b6cd..000000000
--- a/sound/songs/se_seikai.s
+++ /dev/null
@@ -1,44 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_seikai_grp, voicegroup127
-	.equ	se_seikai_pri, 4
-	.equ	se_seikai_rev, reverb_set+50
-	.equ	se_seikai_mvl, 127
-	.equ	se_seikai_key, 0
-	.equ	se_seikai_tbs, 1
-	.equ	se_seikai_exg, 0
-	.equ	se_seikai_cmp, 1
-
-	.section .rodata
-	.global	se_seikai
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_seikai_1:
-	.byte	KEYSH , se_seikai_key+0
-	.byte	TEMPO , 240*se_seikai_tbs/2
-	.byte		VOICE , 5
-	.byte		BENDR , 12
-	.byte		VOL   , 80*se_seikai_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N06   , Gn5 , v127
-	.byte	W06
-	.byte		N18   , Ds5 
-	.byte	W18
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_seikai:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_seikai_pri	@ Priority
-	.byte	se_seikai_rev	@ Reverb.
-
-	.word	se_seikai_grp
-
-	.word	se_seikai_1
-
-	.end

From 88167d3183c82c9f4eda27940a2a176a3bfbf375 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:52:47 -0500
Subject: [PATCH 41/53] Match se_select.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 ++
 sound/songs/midi/se_select.mid | Bin 0 -> 107 bytes
 sound/songs/se_select.s        |  50 ---------------------------------
 4 files changed, 4 insertions(+), 51 deletions(-)
 create mode 100644 sound/songs/midi/se_select.mid
 delete mode 100644 sound/songs/se_select.s

diff --git a/ld_script.txt b/ld_script.txt
index 295ec335e..401c9c784 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -620,7 +620,7 @@ SECTIONS {
         sound/songs/midi/se_pc_login.o(.rodata);
         sound/songs/midi/se_pc_off.o(.rodata);
         sound/songs/midi/se_pc_on.o(.rodata);
-        sound/songs/se_select.o(.rodata);
+        sound/songs/midi/se_select.o(.rodata);
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
         sound/songs/midi/se_door.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1704e2891..ddf2b478b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1071,5 +1071,8 @@ $(MID_SUBDIR)/se_save.s: %.s: %.mid
 $(MID_SUBDIR)/se_seikai.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4
 
+$(MID_SUBDIR)/se_select.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_select.mid b/sound/songs/midi/se_select.mid
new file mode 100644
index 0000000000000000000000000000000000000000..5f38c82d7287de397323767ab003daa922635cbe
GIT binary patch
literal 107
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdvPf_+{10Si=5=8Bug?ILvSK(8&ai>K
op5Xz5FT;d57v_dI28Idg^~??FAR5RA(-8iF2#^pPNC;>G0N&^t2><{9

literal 0
HcmV?d00001

diff --git a/sound/songs/se_select.s b/sound/songs/se_select.s
deleted file mode 100644
index a20e08956..000000000
--- a/sound/songs/se_select.s
+++ /dev/null
@@ -1,50 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_select_grp, voicegroup127
-	.equ	se_select_pri, 5
-	.equ	se_select_rev, reverb_set+50
-	.equ	se_select_mvl, 127
-	.equ	se_select_key, 0
-	.equ	se_select_tbs, 1
-	.equ	se_select_exg, 0
-	.equ	se_select_cmp, 1
-
-	.section .rodata
-	.global	se_select
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_select_1:
-	.byte	KEYSH , se_select_key+0
-	.byte	TEMPO , 300*se_select_tbs/2
-	.byte		VOICE , 87
-	.byte		VOL   , 80*se_select_mvl/mxv
-	.byte		BEND  , c_v+13
-	.byte		N03   , As5 , v068
-	.byte	W03
-	.byte		        Gn6 , v127
-	.byte	W03
-	.byte		        Gn6 , v068
-	.byte	W03
-	.byte		        Gn6 , v127
-	.byte	W03
-	.byte		VOICE , 88
-	.byte		N06   , Gn6 , v068
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_select:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_select_pri	@ Priority
-	.byte	se_select_rev	@ Reverb.
-
-	.word	se_select_grp
-
-	.word	se_select_1
-
-	.end

From a00079e63b31815dc86cc31120f5c0b19dcd2f66 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 17:55:18 -0500
Subject: [PATCH 42/53] Match se_suikomu.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_suikomu.mid | Bin 0 -> 156 bytes
 sound/songs/se_suikomu.s        |  78 --------------------------------
 4 files changed, 4 insertions(+), 79 deletions(-)
 create mode 100644 sound/songs/midi/se_suikomu.mid
 delete mode 100644 sound/songs/se_suikomu.s

diff --git a/ld_script.txt b/ld_script.txt
index 401c9c784..e79826fab 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -675,7 +675,7 @@ SECTIONS {
         sound/songs/midi/se_kon2.o(.rodata);
         sound/songs/midi/se_kon3.o(.rodata);
         sound/songs/midi/se_kon4.o(.rodata);
-        sound/songs/se_suikomu.o(.rodata);
+        sound/songs/midi/se_suikomu.o(.rodata);
         sound/songs/midi/se_nageru.o(.rodata);
         sound/songs/se_toy_c.o(.rodata);
         sound/songs/se_toy_d.o(.rodata);
diff --git a/songs.mk b/songs.mk
index ddf2b478b..126477b99 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1074,5 +1074,8 @@ $(MID_SUBDIR)/se_seikai.s: %.s: %.mid
 $(MID_SUBDIR)/se_select.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
 
+$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_suikomu.mid
new file mode 100644
index 0000000000000000000000000000000000000000..871c8e5d3e39392a5cd6009162ae7b47c8586ed3
GIT binary patch
literal 156
zcmeYb$w*;fU|?flWMF2H@C_--2J(0q{ztGdvPy6;{MToIin%fz;APk#!o$EW!0>>f
zkYR#<0OJOB3m`iTNGAa45Fnioq!WR3J&-PAWT<Cs@MmD2;IF|9q>&6$WjI*Pu#w%H
eVPb#@<3{!vM)qPx_Il>V00!oX0TLh@q!<8$q$FVg

literal 0
HcmV?d00001

diff --git a/sound/songs/se_suikomu.s b/sound/songs/se_suikomu.s
deleted file mode 100644
index eff89df3a..000000000
--- a/sound/songs/se_suikomu.s
+++ /dev/null
@@ -1,78 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_suikomu_grp, voicegroup127
-	.equ	se_suikomu_pri, 5
-	.equ	se_suikomu_rev, reverb_set+50
-	.equ	se_suikomu_mvl, 127
-	.equ	se_suikomu_key, 0
-	.equ	se_suikomu_tbs, 1
-	.equ	se_suikomu_exg, 0
-	.equ	se_suikomu_cmp, 1
-
-	.section .rodata
-	.global	se_suikomu
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_suikomu_1:
-	.byte	KEYSH , se_suikomu_key+0
-	.byte		VOICE , 13
-	.byte		BENDR , 12
-	.byte		VOL   , 12*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+49
-	.byte		N06   , Gn4 , v080
-	.byte	W01
-	.byte		VOL   , 44*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+22
-	.byte	W01
-	.byte		VOL   , 75*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W01
-	.byte		VOL   , 87*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+33
-	.byte	W01
-	.byte		VOL   , 100*se_suikomu_mvl/mxv
-	.byte		BEND  , c_v+54
-	.byte	W01
-	.byte		        c_v+63
-	.byte	W01
-	.byte	W03
-	.byte		N03   , Gn4 , v040
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_suikomu_2:
-	.byte	KEYSH , se_suikomu_key+0
-	.byte		VOICE , 123
-	.byte		VOL   , 59*se_suikomu_mvl/mxv
-	.byte		N06   , Gs4 , v052
-	.byte	W01
-	.byte		VOL   , 72*se_suikomu_mvl/mxv
-	.byte	W01
-	.byte		        90*se_suikomu_mvl/mxv
-	.byte	W01
-	.byte		        100*se_suikomu_mvl/mxv
-	.byte	W03
-	.byte	W03
-	.byte		N03   , Gs4 , v024
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_suikomu:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_suikomu_pri	@ Priority
-	.byte	se_suikomu_rev	@ Reverb.
-
-	.word	se_suikomu_grp
-
-	.word	se_suikomu_1
-	.word	se_suikomu_2
-
-	.end

From 25d4702ac4b420c288b209eb4f8ff3c9c1143b8d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:00:58 -0500
Subject: [PATCH 43/53] Match se_t_ame.mid

---
 ld_script.txt                 |   2 +-
 songs.mk                      |   3 ++
 sound/songs/midi/se_t_ame.mid | Bin 0 -> 118 bytes
 sound/songs/se_t_ame.s        |  65 ----------------------------------
 4 files changed, 4 insertions(+), 66 deletions(-)
 create mode 100644 sound/songs/midi/se_t_ame.mid
 delete mode 100644 sound/songs/se_t_ame.s

diff --git a/ld_script.txt b/ld_script.txt
index e79826fab..f9d8210a6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -696,7 +696,7 @@ SECTIONS {
         sound/songs/se_toy_dango.o(.rodata);
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
-        sound/songs/se_t_ame.o(.rodata);
+        sound/songs/midi/se_t_ame.o(.rodata);
         sound/songs/se_t_ame_e.o(.rodata);
         sound/songs/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 126477b99..1f5087f9c 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1077,5 +1077,8 @@ $(MID_SUBDIR)/se_select.s: %.s: %.mid
 $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
+$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_t_ame.mid
new file mode 100644
index 0000000000000000000000000000000000000000..9e15434cdeb4d849b3970212ed28824122c60b38
GIT binary patch
literal 118
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztGdGD&bS{10Si(F~XP&&C*S10-S@{_8V9
z6<ISJP+{00!o$Gjz`!oS@PNUAVS=*_^9FWpW_CMfb~k4BU}p9>X7(Ir_Il<9X9ke0
K4Upym8UX-%To@Su

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ame.s b/sound/songs/se_t_ame.s
deleted file mode 100644
index 78db57968..000000000
--- a/sound/songs/se_t_ame.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ame_grp, voicegroup128
-	.equ	se_t_ame_pri, 2
-	.equ	se_t_ame_rev, reverb_set+50
-	.equ	se_t_ame_mvl, 127
-	.equ	se_t_ame_key, 0
-	.equ	se_t_ame_tbs, 1
-	.equ	se_t_ame_exg, 0
-	.equ	se_t_ame_cmp, 1
-
-	.section .rodata
-	.global	se_t_ame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ame_1:
-	.byte	KEYSH , se_t_ame_key+0
-	.byte	TEMPO , 220*se_t_ame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 15*se_t_ame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v060
-	.byte	W03
-	.byte		VOL   , 27*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        39*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        52*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        59*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_ame_mvl/mxv
-	.byte	W03
-	.byte		        80*se_t_ame_mvl/mxv
-	.byte	W03
-se_t_ame_1_B1:
-	.byte		N60   , Gn3 , v060
-	.byte	W24
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_ame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ame_pri	@ Priority
-	.byte	se_t_ame_rev	@ Reverb.
-
-	.word	se_t_ame_grp
-
-	.word	se_t_ame_1
-
-	.end

From 5395fc8b57c204c6d334311a549f817c10192b74 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:01:10 -0500
Subject: [PATCH 44/53] Match se_t_koame.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_t_koame.mid | Bin 0 -> 118 bytes
 sound/songs/se_t_koame.s        |  65 --------------------------------
 4 files changed, 4 insertions(+), 66 deletions(-)
 create mode 100644 sound/songs/midi/se_t_koame.mid
 delete mode 100644 sound/songs/se_t_koame.s

diff --git a/ld_script.txt b/ld_script.txt
index f9d8210a6..a12d5b16a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -700,7 +700,7 @@ SECTIONS {
         sound/songs/se_t_ame_e.o(.rodata);
         sound/songs/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
-        sound/songs/se_t_koame.o(.rodata);
+        sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/se_t_koame_e.o(.rodata);
         sound/songs/se_t_kami.o(.rodata);
         sound/songs/se_t_kami2.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 1f5087f9c..9617ce0bd 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1080,5 +1080,8 @@ $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_t_koame.mid
new file mode 100644
index 0000000000000000000000000000000000000000..d8491b29367ffd96a96a081677c366298d338719
GIT binary patch
literal 118
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztGdGD&bS{10Si(F~XP&&C*S10-S@{_8V9
z6<ISJP+{00!o$Gjz`!oS@PNUAVS>8}^9FWpW_CMfb~k4BU}p9>X7(Ir_Il<9cLtEG
K4Upym8UX-$^cWcc

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_koame.s b/sound/songs/se_t_koame.s
deleted file mode 100644
index 6a7acdbf5..000000000
--- a/sound/songs/se_t_koame.s
+++ /dev/null
@@ -1,65 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_koame_grp, voicegroup128
-	.equ	se_t_koame_pri, 2
-	.equ	se_t_koame_rev, reverb_set+50
-	.equ	se_t_koame_mvl, 127
-	.equ	se_t_koame_key, 0
-	.equ	se_t_koame_tbs, 1
-	.equ	se_t_koame_exg, 0
-	.equ	se_t_koame_cmp, 1
-
-	.section .rodata
-	.global	se_t_koame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_koame_1:
-	.byte	KEYSH , se_t_koame_key+0
-	.byte	TEMPO , 220*se_t_koame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 15*se_t_koame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Bn3 , v052
-	.byte	W03
-	.byte		VOL   , 27*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        39*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        52*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        59*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_koame_mvl/mxv
-	.byte	W03
-	.byte		        80*se_t_koame_mvl/mxv
-	.byte	W03
-se_t_koame_1_B1:
-	.byte		N60   , Bn3 , v052
-	.byte	W24
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_koame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_koame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_koame_pri	@ Priority
-	.byte	se_t_koame_rev	@ Reverb.
-
-	.word	se_t_koame_grp
-
-	.word	se_t_koame_1
-
-	.end

From 67d2009d7dc2568f00ee3d29128f1b22627e8670 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:02:42 -0500
Subject: [PATCH 45/53] Match se_t_ame_e.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_t_ame_e.mid | Bin 0 -> 134 bytes
 sound/songs/se_t_ame_e.s        |  74 --------------------------------
 4 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 sound/songs/midi/se_t_ame_e.mid
 delete mode 100644 sound/songs/se_t_ame_e.s

diff --git a/ld_script.txt b/ld_script.txt
index a12d5b16a..746ed9e51 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -697,7 +697,7 @@ SECTIONS {
         sound/songs/midi/se_doku.o(.rodata);
         sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/midi/se_t_ame.o(.rodata);
-        sound/songs/se_t_ame_e.o(.rodata);
+        sound/songs/midi/se_t_ame_e.o(.rodata);
         sound/songs/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9617ce0bd..b320d0a15 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1080,6 +1080,9 @@ $(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
 $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_t_ame_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..2397eea6482ad078008105880affa373eb1dfe17
GIT binary patch
literal 134
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?IL3S~H;!mvSv
zhk?t1fxVvL0fPg>1ZNxO4eXW7>}AaC#mwwE%<O5*?6J)30n81~3=A9C-JmLLnc2;l
X*|nM36`0v2nAruG*}1?ffQADA#<v)(

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ame_e.s b/sound/songs/se_t_ame_e.s
deleted file mode 100644
index 5558a5118..000000000
--- a/sound/songs/se_t_ame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ame_e_grp, voicegroup128
-	.equ	se_t_ame_e_pri, 2
-	.equ	se_t_ame_e_rev, reverb_set+50
-	.equ	se_t_ame_e_mvl, 127
-	.equ	se_t_ame_e_key, 0
-	.equ	se_t_ame_e_tbs, 1
-	.equ	se_t_ame_e_exg, 0
-	.equ	se_t_ame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_ame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ame_e_1:
-	.byte	KEYSH , se_t_ame_e_key+0
-	.byte	TEMPO , 220*se_t_ame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 80*se_t_ame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v060
-	.byte	W03
-	.byte		VOL   , 76*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        72*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        64*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        58*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        50*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_ame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 38*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        34*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        27*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        20*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        15*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        10*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte		        6*se_t_ame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ame_e_pri	@ Priority
-	.byte	se_t_ame_e_rev	@ Reverb.
-
-	.word	se_t_ame_e_grp
-
-	.word	se_t_ame_e_1
-
-	.end

From 83f73b7fd73be6e577018cb7a5c4f62cb2b92882 Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:04:42 -0500
Subject: [PATCH 46/53] Match se_t_kami.mid

---
 ld_script.txt                  |   2 +-
 songs.mk                       |   3 +
 sound/songs/midi/se_t_kami.mid | Bin 0 -> 191 bytes
 sound/songs/se_t_kami.s        |  98 ---------------------------------
 4 files changed, 4 insertions(+), 99 deletions(-)
 create mode 100644 sound/songs/midi/se_t_kami.mid
 delete mode 100644 sound/songs/se_t_kami.s

diff --git a/ld_script.txt b/ld_script.txt
index 746ed9e51..ed31037d7 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -702,7 +702,7 @@ SECTIONS {
         sound/songs/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/se_t_koame_e.o(.rodata);
-        sound/songs/se_t_kami.o(.rodata);
+        sound/songs/midi/se_t_kami.o(.rodata);
         sound/songs/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/midi/se_hinsi.o(.rodata);
diff --git a/songs.mk b/songs.mk
index b320d0a15..aac11ad7b 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1083,6 +1083,9 @@ $(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
+
 $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_t_kami.mid
new file mode 100644
index 0000000000000000000000000000000000000000..71d8163bda3d66e624f7f0d1329b0b8ee92f7cfc
GIT binary patch
literal 191
zcmXYrF$%&!6htTaVZSS>j76{#th5mk%oY|)3c(^pAfly(g^(s#NIG)@$x-$Q9wj%4
zKWI1eW(FoJ?l%Am9(=@E@hHVb=r4ii$0PJP1<Nz~HU7~Xp9$PF#Mpvg=wQ*>iaMMK
zmKqB|2SK%<l#mb>>PMxR)T)D_CK*~Av}PFYHH^lVu+o?-$4|*-+Hs}16d8%U$}A+u
Ph32E?RPios42D-<6DugS

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_kami.s b/sound/songs/se_t_kami.s
deleted file mode 100644
index 6ac8ae06f..000000000
--- a/sound/songs/se_t_kami.s
+++ /dev/null
@@ -1,98 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_kami_grp, voicegroup128
-	.equ	se_t_kami_pri, 3
-	.equ	se_t_kami_rev, reverb_set+50
-	.equ	se_t_kami_mvl, 127
-	.equ	se_t_kami_key, 0
-	.equ	se_t_kami_tbs, 1
-	.equ	se_t_kami_exg, 0
-	.equ	se_t_kami_cmp, 1
-
-	.section .rodata
-	.global	se_t_kami
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_kami_1:
-	.byte	KEYSH , se_t_kami_key+0
-	.byte	TEMPO , 220*se_t_kami_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_t_kami_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N09   , En3 , v112
-	.byte	W03
-	.byte		BEND  , c_v+21
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W03
-	.byte		        c_v+6
-	.byte		N15   , En3 , v120
-	.byte	W03
-	.byte		BEND  , c_v+2
-	.byte	W03
-	.byte		        c_v-9
-	.byte	W03
-	.byte		        c_v-29
-	.byte	W06
-	.byte		        c_v+0
-	.byte		N09   , Gn2 
-	.byte	W06
-	.byte		BEND  , c_v-8
-	.byte	W03
-	.byte		        c_v-15
-	.byte		TIE   , Gs2 , v112
-	.byte	W03
-	.byte		BEND  , c_v-4
-	.byte	W09
-	.byte		        c_v-8
-	.byte	W03
-	.byte	W06
-	.byte		        c_v-13
-	.byte	W03
-	.byte		        c_v-22
-	.byte	W09
-	.byte		        c_v-32
-	.byte	W06
-	.byte		VOL   , 102*se_t_kami_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W09
-	.byte		VOL   , 97*se_t_kami_mvl/mxv
-	.byte	W09
-	.byte		        92*se_t_kami_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W06
-	.byte	W03
-	.byte		VOL   , 83*se_t_kami_mvl/mxv
-	.byte	W06
-	.byte		BEND  , c_v-52
-	.byte	W03
-	.byte		VOL   , 72*se_t_kami_mvl/mxv
-	.byte	W09
-	.byte		        63*se_t_kami_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte		        57*se_t_kami_mvl/mxv
-	.byte	W06
-	.byte		        46*se_t_kami_mvl/mxv
-	.byte	W12
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_kami:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_kami_pri	@ Priority
-	.byte	se_t_kami_rev	@ Reverb.
-
-	.word	se_t_kami_grp
-
-	.word	se_t_kami_1
-
-	.end

From bfb84d3073bd6a2bdcff44c33a2eda24178a217c Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:06:03 -0500
Subject: [PATCH 47/53] Match se_t_kami2.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_t_kami2.mid | Bin 0 -> 142 bytes
 sound/songs/se_t_kami2.s        |  80 --------------------------------
 4 files changed, 4 insertions(+), 81 deletions(-)
 create mode 100644 sound/songs/midi/se_t_kami2.mid
 delete mode 100644 sound/songs/se_t_kami2.s

diff --git a/ld_script.txt b/ld_script.txt
index ed31037d7..99347f7a8 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -703,7 +703,7 @@ SECTIONS {
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/se_t_koame_e.o(.rodata);
         sound/songs/midi/se_t_kami.o(.rodata);
-        sound/songs/se_t_kami2.o(.rodata);
+        sound/songs/midi/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
         sound/songs/midi/se_hinsi.o(.rodata);
         sound/songs/midi/se_expmax.o(.rodata);
diff --git a/songs.mk b/songs.mk
index aac11ad7b..48b3401bd 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1086,6 +1086,9 @@ $(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_kami.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
 
+$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
+
 $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_t_kami2.mid
new file mode 100644
index 0000000000000000000000000000000000000000..c47731b9450ee91f8d00e7abc8b046b4b6b2e3b3
GIT binary patch
literal 142
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?ILie)$;#IQkx
zhk?t1fxVvL0Yfsw1fv4x2MpfK3=Yf;Zfpz=5)2M(3^tq$#+(d#oEzB7fQr<CbODf-
e0@B$)S{O(tusvYlVcx**#l~*V)?mZ{vIGFe3LQ59

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_kami2.s b/sound/songs/se_t_kami2.s
deleted file mode 100644
index 1c400fe6a..000000000
--- a/sound/songs/se_t_kami2.s
+++ /dev/null
@@ -1,80 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_kami2_grp, voicegroup128
-	.equ	se_t_kami2_pri, 3
-	.equ	se_t_kami2_rev, reverb_set+50
-	.equ	se_t_kami2_mvl, 127
-	.equ	se_t_kami2_key, 0
-	.equ	se_t_kami2_tbs, 1
-	.equ	se_t_kami2_exg, 0
-	.equ	se_t_kami2_cmp, 1
-
-	.section .rodata
-	.global	se_t_kami2
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_kami2_1:
-	.byte	KEYSH , se_t_kami2_key+0
-	.byte	TEMPO , 220*se_t_kami2_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v+35
-	.byte		TIE   , Dn2 , v112
-	.byte	W03
-	.byte		BEND  , c_v+11
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W03
-	.byte		        c_v+6
-	.byte	W06
-	.byte		        c_v+0
-	.byte	W09
-	.byte	W15
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v-4
-	.byte	W03
-	.byte	W06
-	.byte		        c_v-13
-	.byte	W09
-	.byte		        c_v-18
-	.byte	W09
-	.byte		VOL   , 102*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-25
-	.byte	W09
-	.byte		VOL   , 97*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W09
-	.byte		VOL   , 92*se_t_kami2_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W06
-	.byte	W03
-	.byte		VOL   , 83*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		BEND  , c_v-52
-	.byte	W03
-	.byte		VOL   , 64*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		        47*se_t_kami2_mvl/mxv
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_kami2:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_kami2_pri	@ Priority
-	.byte	se_t_kami2_rev	@ Reverb.
-
-	.word	se_t_kami2_grp
-
-	.word	se_t_kami2_1
-
-	.end

From fc57e8dd52e25158561103f662a3178cf0df1dbb Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:07:28 -0500
Subject: [PATCH 48/53] Match se_t_koame_e.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_t_koame_e.mid | Bin 0 -> 134 bytes
 sound/songs/se_t_koame_e.s        |  74 ------------------------------
 4 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 sound/songs/midi/se_t_koame_e.mid
 delete mode 100644 sound/songs/se_t_koame_e.s

diff --git a/ld_script.txt b/ld_script.txt
index 99347f7a8..e7cc1e7cc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -701,7 +701,7 @@ SECTIONS {
         sound/songs/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
-        sound/songs/se_t_koame_e.o(.rodata);
+        sound/songs/midi/se_t_koame_e.o(.rodata);
         sound/songs/midi/se_t_kami.o(.rodata);
         sound/songs/midi/se_t_kami2.o(.rodata);
         sound/songs/midi/se_elebeta.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 48b3401bd..9e09ce176 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1092,5 +1092,8 @@ $(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_t_koame_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..4a04f73f9e7f4f07e6dda90ccba5c11e8d88f2de
GIT binary patch
literal 134
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?IL3S~H;!mvSv
zhk?t1fxVvL0fPg>1a}kW4eXW7>}AaC#mwwE%<O5*?6J)30n82V3=A9C-JmLLnc2;l
X*|nM36`0v2nAruG*}1?ffQADA#rGJj

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_koame_e.s b/sound/songs/se_t_koame_e.s
deleted file mode 100644
index 7570d98cd..000000000
--- a/sound/songs/se_t_koame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_koame_e_grp, voicegroup128
-	.equ	se_t_koame_e_pri, 2
-	.equ	se_t_koame_e_rev, reverb_set+50
-	.equ	se_t_koame_e_mvl, 127
-	.equ	se_t_koame_e_key, 0
-	.equ	se_t_koame_e_tbs, 1
-	.equ	se_t_koame_e_exg, 0
-	.equ	se_t_koame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_koame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_koame_e_1:
-	.byte	KEYSH , se_t_koame_e_key+0
-	.byte	TEMPO , 220*se_t_koame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 80*se_t_koame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Bn3 , v052
-	.byte	W03
-	.byte		VOL   , 76*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        72*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        68*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        64*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        58*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        50*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        44*se_t_koame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 38*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        34*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        27*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        20*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        15*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        10*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte		        6*se_t_koame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_koame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_koame_e_pri	@ Priority
-	.byte	se_t_koame_e_rev	@ Reverb.
-
-	.word	se_t_koame_e_grp
-
-	.word	se_t_koame_e_1
-
-	.end

From 60a7134710686515776e321e1d32ddf2dc97442a Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:09:21 -0500
Subject: [PATCH 49/53] Match se_t_ooame.mid

---
 ld_script.txt                   |   2 +-
 songs.mk                        |   3 ++
 sound/songs/midi/se_t_ooame.mid | Bin 0 -> 118 bytes
 sound/songs/se_t_ooame.s        |  64 --------------------------------
 4 files changed, 4 insertions(+), 65 deletions(-)
 create mode 100644 sound/songs/midi/se_t_ooame.mid
 delete mode 100644 sound/songs/se_t_ooame.s

diff --git a/ld_script.txt b/ld_script.txt
index e7cc1e7cc..171aa9362 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -698,7 +698,7 @@ SECTIONS {
         sound/songs/midi/se_esuka.o(.rodata);
         sound/songs/midi/se_t_ame.o(.rodata);
         sound/songs/midi/se_t_ame_e.o(.rodata);
-        sound/songs/se_t_ooame.o(.rodata);
+        sound/songs/midi/se_t_ooame.o(.rodata);
         sound/songs/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/midi/se_t_koame_e.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 9e09ce176..4f9bb601f 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1095,5 +1095,8 @@ $(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
+$(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_ooame.mid b/sound/songs/midi/se_t_ooame.mid
new file mode 100644
index 0000000000000000000000000000000000000000..3aedd44044f8f1daeb75c5d95456bf39e40621b9
GIT binary patch
literal 118
zcmeYb$w*;fU|?flWME>D@C_--2J&PX{ztGdGD&bS{10Si(F~XP&&C+70wiJ?{_8V9
z6<ISJP+{00!o$Gjz`!of@PNUAVS<ef^9FV;W_DX<b~k4BU}p9>X7(Ir_Il<98wQZ9
K3XtXj8UX-tAQ#F2

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ooame.s b/sound/songs/se_t_ooame.s
deleted file mode 100644
index 434f20779..000000000
--- a/sound/songs/se_t_ooame.s
+++ /dev/null
@@ -1,64 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ooame_grp, voicegroup128
-	.equ	se_t_ooame_pri, 2
-	.equ	se_t_ooame_rev, reverb_set+50
-	.equ	se_t_ooame_mvl, 127
-	.equ	se_t_ooame_key, 0
-	.equ	se_t_ooame_tbs, 1
-	.equ	se_t_ooame_exg, 0
-	.equ	se_t_ooame_cmp, 1
-
-	.section .rodata
-	.global	se_t_ooame
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ooame_1:
-	.byte	KEYSH , se_t_ooame_key+0
-	.byte	TEMPO , 220*se_t_ooame_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 18*se_t_ooame_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v060
-	.byte	W03
-	.byte		VOL   , 33*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        48*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        55*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        65*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        74*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        85*se_t_ooame_mvl/mxv
-	.byte	W03
-	.byte		        100*se_t_ooame_mvl/mxv
-	.byte	W03
-se_t_ooame_1_B1:
-	.byte		N36   , Cn3 , v060
-	.byte	W24
-	.byte	W12
-	.byte	GOTO
-	 .word	se_t_ooame_1_B1
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ooame:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ooame_pri	@ Priority
-	.byte	se_t_ooame_rev	@ Reverb.
-
-	.word	se_t_ooame_grp
-
-	.word	se_t_ooame_1
-
-	.end

From 27d46fa3a8542615de455bcc9068480ed1b5a44d Mon Sep 17 00:00:00 2001
From: Kermalis <29823718+Kermalis@users.noreply.github.com>
Date: Tue, 20 Nov 2018 18:10:25 -0500
Subject: [PATCH 50/53] Match se_t_ooame_e.mid

---
 ld_script.txt                     |   2 +-
 songs.mk                          |   3 ++
 sound/songs/midi/se_t_ooame_e.mid | Bin 0 -> 134 bytes
 sound/songs/se_t_ooame_e.s        |  74 ------------------------------
 4 files changed, 4 insertions(+), 75 deletions(-)
 create mode 100644 sound/songs/midi/se_t_ooame_e.mid
 delete mode 100644 sound/songs/se_t_ooame_e.s

diff --git a/ld_script.txt b/ld_script.txt
index 171aa9362..635f09662 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -699,7 +699,7 @@ SECTIONS {
         sound/songs/midi/se_t_ame.o(.rodata);
         sound/songs/midi/se_t_ame_e.o(.rodata);
         sound/songs/midi/se_t_ooame.o(.rodata);
-        sound/songs/se_t_ooame_e.o(.rodata);
+        sound/songs/midi/se_t_ooame_e.o(.rodata);
         sound/songs/midi/se_t_koame.o(.rodata);
         sound/songs/midi/se_t_koame_e.o(.rodata);
         sound/songs/midi/se_t_kami.o(.rodata);
diff --git a/songs.mk b/songs.mk
index 4f9bb601f..3520e5c05 100644
--- a/songs.mk
+++ b/songs.mk
@@ -1098,5 +1098,8 @@ $(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
 $(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
 
+$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid
+	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
+
 $(MID_SUBDIR)/se_z_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_t_ooame_e.mid
new file mode 100644
index 0000000000000000000000000000000000000000..b73010142d4436e23eba6296c95e6f006bd48e3f
GIT binary patch
literal 134
zcmeYb$w*;fU|?flWME>D@C_--2J(a%{ztGdGD&bS{10Si(F|w!ug?IL3S~H;!mvSv
zhk?t1fxVvL0fPg>1RERX4eV9S?B&et#mwwE%<SpR?6J)3{>%+F3=A9C-JmLLnc2;l
X*|nJ26`0w@nb`%H**U=~fQADA!xtEj

literal 0
HcmV?d00001

diff --git a/sound/songs/se_t_ooame_e.s b/sound/songs/se_t_ooame_e.s
deleted file mode 100644
index 329cd3702..000000000
--- a/sound/songs/se_t_ooame_e.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_t_ooame_e_grp, voicegroup128
-	.equ	se_t_ooame_e_pri, 2
-	.equ	se_t_ooame_e_rev, reverb_set+50
-	.equ	se_t_ooame_e_mvl, 127
-	.equ	se_t_ooame_e_key, 0
-	.equ	se_t_ooame_e_tbs, 1
-	.equ	se_t_ooame_e_exg, 0
-	.equ	se_t_ooame_e_cmp, 1
-
-	.section .rodata
-	.global	se_t_ooame_e
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_t_ooame_e_1:
-	.byte	KEYSH , se_t_ooame_e_key+0
-	.byte	TEMPO , 220*se_t_ooame_e_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_t_ooame_e_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Cn3 , v060
-	.byte	W03
-	.byte		VOL   , 96*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        93*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        90*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        85*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        81*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        73*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        62*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        55*se_t_ooame_e_mvl/mxv
-	.byte		N24   
-	.byte	W03
-	.byte		VOL   , 48*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        42*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        33*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        25*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        18*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        12*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte		        7*se_t_ooame_e_mvl/mxv
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_t_ooame_e:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_t_ooame_e_pri	@ Priority
-	.byte	se_t_ooame_e_rev	@ Reverb.
-
-	.word	se_t_ooame_e_grp
-
-	.word	se_t_ooame_e_1
-
-	.end

From c7ca38ccf3a93c8f2880f1d0370d20aea46bd6be Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 21 Nov 2018 21:58:35 +0100
Subject: [PATCH 51/53] Match DecompressGlyphTile

---
 include/text.h      |  18 +--
 src/battle_arena.c  |   1 +
 src/berry.c         |   6 +-
 src/dewford_trend.c |   3 +-
 src/text.c          | 343 ++++++++++++--------------------------------
 5 files changed, 108 insertions(+), 263 deletions(-)

diff --git a/include/text.h b/include/text.h
index 4946f1c5f..853e93e90 100644
--- a/include/text.h
+++ b/include/text.h
@@ -109,7 +109,8 @@
 
 #define TEXT_SPEED_FF 0xFF
 
-enum {
+enum
+{
     FONTATTR_MAX_LETTER_WIDTH,
     FONTATTR_MAX_LETTER_HEIGHT,
     FONTATTR_LETTER_SPACING,
@@ -205,21 +206,16 @@ typedef struct {
 
 struct Struct_03002F90
 {
-    u8 unk0[0x20];
-    u8 unk20[0x20];
-    u8 unk40[0x20];
-    u8 unk60[0x20];
+    u32 unk0[8];
+    u32 unk20[8];
+    u32 unk40[8];
+    u32 unk60[8];
     u8 unk80;
     u8 unk81;
 };
 
 extern TextFlags gTextFlags;
 
-extern u8 gStringVar1[];
-extern u8 gStringVar2[];
-extern u8 gStringVar3[];
-extern u8 gStringVar4[];
-
 extern u8 gUnknown_03002F84;
 extern struct Struct_03002F90 gUnknown_03002F90;
 
@@ -233,7 +229,7 @@ u32 RenderFont(struct TextPrinter *textPrinter);
 void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
 void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
 void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
-void DecompressGlyphTile(const u16 *src, u16 *dest);
+void DecompressGlyphTile(const u16 *src, void *dest_);
 u8 GetLastTextColor(u8 colorType);
 void CopyGlyphToWindow(struct TextPrinter *x);
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
diff --git a/src/battle_arena.c b/src/battle_arena.c
index c686ed791..cd2c976da 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -15,6 +15,7 @@
 #include "palette.h"
 #include "random.h"
 #include "sound.h"
+#include "string_util.h"
 #include "text.h"
 #include "util.h"
 #include "constants/songs.h"
diff --git a/src/berry.c b/src/berry.c
index 7cd28d69f..9f08165b8 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,10 +1,13 @@
 #include "global.h"
 #include "berry.h"
 #include "event_data.h"
+#include "field_control_avatar.h"
 #include "fieldmap.h"
 #include "item.h"
+#include "item_menu.h"
 #include "main.h"
 #include "random.h"
+#include "string_util.h"
 #include "text.h"
 #include "constants/event_object_movement_constants.h"
 #include "constants/items.h"
@@ -12,11 +15,8 @@
 extern u8 EventObjectGetBerryTreeId(u8 eventObjectId);
 extern void sub_8092EF0(u8 mapId, u8 mapNumber, u8 mapGroup);
 extern void CB2_ChooseBerry(void);
-extern const u8* GetEventObjectScriptPointerPlayerFacing(void);
 extern bool8 IsBerryTreeSparkling(u8, u8, u8);
 
-extern u16 gSpecialVar_ItemId;
-
 extern const u8 BerryTreeScript[];
 
 static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry);
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 44b42c123..3050ebecf 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -1,13 +1,14 @@
 #include "global.h"
 #include "dewford_trend.h"
 #include "easy_chat.h"
-#include "constants/easy_chat.h"
 #include "event_data.h"
 #include "link.h"
 #include "malloc.h"
 #include "random.h"
 #include "text.h"
 #include "tv.h"
+#include "string_util.h"
+#include "constants/easy_chat.h"
 
 // static functions
 static void sub_8122804(struct EasyChatPair *s, u16 b, u8 c);
diff --git a/src/text.c b/src/text.c
index b134bcacd..5f86d90d4 100644
--- a/src/text.c
+++ b/src/text.c
@@ -29,7 +29,8 @@ u8 gUnknown_03002F84;
 struct Struct_03002F90 gUnknown_03002F90;
 TextFlags gTextFlags;
 
-const u8 gFontHalfRowOffsets[] = {
+const u8 gFontHalfRowOffsets[] =
+{
     0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00,
     0x09, 0x0A, 0x0B, 0x09, 0x0C, 0x0D, 0x0E, 0x0C, 0x0F, 0x10, 0x11, 0x0F, 0x09, 0x0A, 0x0B, 0x09,
     0x12, 0x13, 0x14, 0x12, 0x15, 0x16, 0x17, 0x15, 0x18, 0x19, 0x1A, 0x18, 0x12, 0x13, 0x14, 0x12,
@@ -55,7 +56,8 @@ const u8 gUnusedFRLGDownArrow[] = INCBIN_U8("data/graphics/fonts/unused_frlg_dow
 const u8 gDownArrowYCoords[] = { 0x0, 0x1, 0x2, 0x1 };
 const u8 gWindowVerticalScrollSpeeds[] = { 0x1, 0x2, 0x4, 0x0 };
 
-const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
+const struct GlyphWidthFunc gGlyphWidthFuncs[] =
+{
     { 0x0, GetGlyphWidthFont0 },
     { 0x1, GetGlyphWidthFont1 },
     { 0x2, GetGlyphWidthFont2 },
@@ -67,7 +69,8 @@ const struct GlyphWidthFunc gGlyphWidthFuncs[] = {
     { 0x8, GetGlyphWidthFont8 }
 };
 
-const struct KeypadIcon gKeypadIcons[] = {
+const struct KeypadIcon gKeypadIcons[] =
+{
     {  0x0,  0x8, 0xC },
     {  0x1,  0x8, 0xC },
     {  0x2, 0x10, 0xC },
@@ -85,7 +88,8 @@ const struct KeypadIcon gKeypadIcons[] = {
 
 const u8 gKeypadIconTiles[] = INCBIN_U8("data/graphics/fonts/keypad_icons.4bpp");
 
-const struct FontInfo gFontInfos[] = {
+const struct FontInfo gFontInfos[] =
+{
     { Font0Func, 0x5,  0xC, 0x0, 0x0, 0x0, 0x2, 0x1, 0x3 },
     { Font1Func, 0x6, 0x10, 0x0, 0x0, 0x0, 0x2, 0x1, 0x3 },
     { Font2Func, 0x6,  0xE, 0x0, 0x0, 0x0, 0x2, 0x1, 0x3 },
@@ -98,7 +102,8 @@ const struct FontInfo gFontInfos[] = {
     { NULL,      0x8,  0x8, 0x0, 0x0, 0x0, 0x1, 0x2, 0xF }
 };
 
-const u8 gMenuCursorDimensions[][2] = {
+const u8 gMenuCursorDimensions[][2] =
+{
     { 0x8,  0xC },
     { 0x8,  0xF },
     { 0x8,  0xE },
@@ -211,25 +216,25 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, voi
 void RunTextPrinters(void)
 {
     int i;
-    u16 temp;
 
     if (gUnknown_03002F84 == 0)
     {
         for (i = 0; i < 0x20; ++i)
         {
-            if (gTextPrinters[i].active != 0)
+            if (gTextPrinters[i].active)
             {
-                temp = RenderFont(&gTextPrinters[i]);
-                switch (temp) {
-                    case 0:
-                        CopyWindowToVram(gTextPrinters[i].printerTemplate.windowId, 2);
-                    case 3:
-                        if (gTextPrinters[i].callback != 0)
-                            gTextPrinters[i].callback(&gTextPrinters[i].printerTemplate, temp);
-                        break;
-                    case 1:
-                        gTextPrinters[i].active = 0;
-                        break;
+                u16 temp = RenderFont(&gTextPrinters[i]);
+                switch (temp)
+                {
+                case 0:
+                    CopyWindowToVram(gTextPrinters[i].printerTemplate.windowId, 2);
+                case 3:
+                    if (gTextPrinters[i].callback != 0)
+                        gTextPrinters[i].callback(&gTextPrinters[i].printerTemplate, temp);
+                    break;
+                case 1:
+                    gTextPrinters[i].active = 0;
+                    break;
                 }
             }
         }
@@ -843,207 +848,49 @@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
     GenerateFontHalfRowLookupTable(*fgColor, *bgColor, *shadowColor);
 }
 
-#ifdef NONMATCHING
-void DecompressGlyphTile(const u16 *src, u16 *dest)
+void DecompressGlyphTile(const u16 *src, void *dest_)
 {
     u32 temp;
+    u32 *dest = dest_;
+
+    temp = *(src);
+    *(dest)++ = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
 
-    temp = src[0];
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
     temp = src[1];
     src += 2;
-    dest[1] = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
-    dest++;
+    *(dest)++ = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
     temp = *(src++);
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]];
-    *(dest++) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[src[0] & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[src[0] >> 8]];
-    *(dest) = (gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] & 0xFF]] << 16) | gFontHalfRowLookupTable[gFontHalfRowOffsets[src[1] >> 8]];
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
 }
-#else
-NAKED
-void DecompressGlyphTile(const u16 *src, u16 *dest)
-{
-    asm("push {r4-r7,lr}\n\
-    mov r7, r8\n\
-    push {r7}\n\
-    ldrh r7, [r0]\n\
-    ldr r5, =gFontHalfRowLookupTable\n\
-    ldr r4, =gFontHalfRowOffsets\n\
-    mov r2, #0xFF\n\
-    mov r8, r2\n\
-    add r2, r7, #0\n\
-    mov r3, r8\n\
-    and r2, r3\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r3, [r2]\n\
-    lsl r3, #16\n\
-    lsr r2, r7, #8\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r2, [r2]\n\
-    orr r3, r2\n\
-    add r6, r1, #0\n\
-    stmia r6!, {r3}\n\
-    ldrh r7, [r0, #0x2]\n\
-    add r0, #0x4\n\
-    add r2, r7, #0\n\
-    mov r3, r8\n\
-    and r2, r3\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r3, [r2]\n\
-    lsl r3, #16\n\
-    lsr r2, r7, #8\n\
-    add r2, r4\n\
-    ldrb r2, [r2]\n\
-    lsl r2, #1\n\
-    add r2, r5\n\
-    ldrh r2, [r2]\n\
-    orr r3, r2\n\
-    str r3, [r1, #0x4]\n\
-    add r6, #0x4\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    mov r2, r8\n\
-    and r1, r2\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    mov r3, r8\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r0, #0x2\n\
-    add r1, r7, #0\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0]\n\
-    add r1, r7, #0\n\
-    and r1, r3\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r2, [r1]\n\
-    lsl r2, #16\n\
-    lsr r1, r7, #8\n\
-    add r1, r4\n\
-    ldrb r1, [r1]\n\
-    lsl r1, #1\n\
-    add r1, r5\n\
-    ldrh r1, [r1]\n\
-    orr r2, r1\n\
-    stmia r6!, {r2}\n\
-    ldrh r7, [r0, #0x2]\n\
-    add r0, r7, #0\n\
-    and r0, r3\n\
-    add r0, r4\n\
-    ldrb r0, [r0]\n\
-    lsl r0, #1\n\
-    add r0, r5\n\
-    ldrh r1, [r0]\n\
-    lsl r1, #16\n\
-    lsr r0, r7, #8\n\
-    add r0, r4\n\
-    ldrb r0, [r0]\n\
-    lsl r0, #1\n\
-    add r0, r5\n\
-    ldrh r0, [r0]\n\
-    orr r1, r0\n\
-    str r1, [r6]\n\
-    pop {r3}\n\
-    mov r8, r3\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .pool");
-}
-#endif
 
 u8 GetLastTextColor(u8 colorType)
 {
     switch (colorType)
     {
-        case 0:
-            return gLastTextFgColor;
-        case 2:
-            return gLastTextBgColor;
-        case 1:
-            return gLastTextShadowColor;
-        default:
-            return 0;
+    case 0:
+        return gLastTextFgColor;
+    case 2:
+        return gLastTextBgColor;
+    case 1:
+        return gLastTextShadowColor;
+    default:
+        return 0;
     }
 }
 
@@ -2802,8 +2649,8 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
     if (isJapanese == 1)
     {
         glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 12;    // gGlyphHeight
     }
@@ -2814,15 +2661,15 @@ void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 13;
@@ -2845,8 +2692,8 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese)
     {
         int eff;
         glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF)));  // shh, no questions, only matching now
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 15;    // gGlyphHeight
     }
@@ -2857,15 +2704,15 @@ void DecompressGlyphFont7(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 15;
@@ -2887,8 +2734,8 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
     {
         glyphs = gFont0JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF));
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 12;    // gGlyphHeight
     }
@@ -2899,15 +2746,15 @@ void DecompressGlyphFont8(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 12;
@@ -2929,10 +2776,10 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
     if (isJapanese == TRUE)
     {
         glyphs = gFont2JapaneseGlyphs + (0x100 * (glyphId >> 0x3)) + (0x10 * (glyphId & 0x7));
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));    // gUnknown_03002F90 + 0x40
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x20
-        DecompressGlyphTile(glyphs + 0x88, (u16 *)(gUnknown_03002F90.unk60));    // gUnknown_03002F90 + 0x60
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x20
+        DecompressGlyphTile(glyphs + 0x88, gUnknown_03002F90.unk60);    // gUnknown_03002F90 + 0x60
         gUnknown_03002F90.unk80 = gFont2JapaneseGlyphWidths[glyphId];     // gGlyphWidth
         gUnknown_03002F90.unk81 = 14;    // gGlyphHeight
     }
@@ -2943,15 +2790,15 @@ void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 14;
@@ -2974,8 +2821,8 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
     {
         int eff;
         glyphs = gFont1JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & (eff = 0xF)));  // shh, no questions, only matching now
-        DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-        DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));    // gUnknown_03002F90 + 0x40
+        DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+        DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);    // gUnknown_03002F90 + 0x40
         gUnknown_03002F90.unk80 = 8;     // gGlyphWidth
         gUnknown_03002F90.unk81 = 15;    // gGlyphHeight
     }
@@ -2986,15 +2833,15 @@ void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese)
 
         if (gUnknown_03002F90.unk80 <= 8)
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
         }
         else
         {
-            DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-            DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90.unk20));
-            DecompressGlyphTile(glyphs + 0x10, (u16 *)(gUnknown_03002F90.unk40));
-            DecompressGlyphTile(glyphs + 0x18, (u16 *)(gUnknown_03002F90.unk60));
+            DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+            DecompressGlyphTile(glyphs + 0x8, gUnknown_03002F90.unk20);
+            DecompressGlyphTile(glyphs + 0x10, gUnknown_03002F90.unk40);
+            DecompressGlyphTile(glyphs + 0x18, gUnknown_03002F90.unk60);
         }
 
         gUnknown_03002F90.unk81 = 15;
@@ -3014,8 +2861,8 @@ void DecompressGlyphFont9(u16 glyphId)
     const u16* glyphs;
 
     glyphs = gFont9JapaneseGlyphs + (0x100 * (glyphId >> 4)) + (0x8 * (glyphId & 0xF));
-    DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90.unk0);
-    DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90.unk40));
+    DecompressGlyphTile(glyphs, gUnknown_03002F90.unk0);
+    DecompressGlyphTile(glyphs + 0x80, gUnknown_03002F90.unk40);
     gUnknown_03002F90.unk80 = 8;
     gUnknown_03002F90.unk81 = 12;
 }

From d70c3a94c58584a809dc90feb3b1a50cc5ca3f07 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 21 Nov 2018 23:30:04 +0100
Subject: [PATCH 52/53] match DecompressGlyphTile nicer

---
 include/text.h |  2 +-
 src/text.c     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/text.h b/include/text.h
index 853e93e90..27a6364bb 100644
--- a/include/text.h
+++ b/include/text.h
@@ -229,7 +229,7 @@ u32 RenderFont(struct TextPrinter *textPrinter);
 void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
 void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
 void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
-void DecompressGlyphTile(const u16 *src, void *dest_);
+void DecompressGlyphTile(const void *src_, void *dest_);
 u8 GetLastTextColor(u8 colorType);
 void CopyGlyphToWindow(struct TextPrinter *x);
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
diff --git a/src/text.c b/src/text.c
index 5f86d90d4..1966ffb2c 100644
--- a/src/text.c
+++ b/src/text.c
@@ -848,17 +848,17 @@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
     GenerateFontHalfRowLookupTable(*fgColor, *bgColor, *shadowColor);
 }
 
-void DecompressGlyphTile(const u16 *src, void *dest_)
+void DecompressGlyphTile(const u16 *src_, void *dest_)
 {
     u32 temp;
+    const u16 *src = src_;
     u32 *dest = dest_;
 
-    temp = *(src);
+    temp = *(src++);
     *(dest)++ = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
 
-    temp = src[1];
-    src += 2;
-    *(dest)++ = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
+    temp = *(src++);
+    *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);
 
     temp = *(src++);
     *(dest++) = ((gFontHalfRowLookupTable[gFontHalfRowOffsets[temp & 0xFF]]) << 16) | (gFontHalfRowLookupTable[gFontHalfRowOffsets[temp >> 8]]);

From a900a51a595278bc5dd1fcda776de7dad21bcf11 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 21 Nov 2018 23:30:50 +0100
Subject: [PATCH 53/53] match DecompressGlyphTile nicer

---
 src/text.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/text.c b/src/text.c
index 1966ffb2c..2380e3191 100644
--- a/src/text.c
+++ b/src/text.c
@@ -848,7 +848,7 @@ void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor)
     GenerateFontHalfRowLookupTable(*fgColor, *bgColor, *shadowColor);
 }
 
-void DecompressGlyphTile(const u16 *src_, void *dest_)
+void DecompressGlyphTile(const void *src_, void *dest_)
 {
     u32 temp;
     const u16 *src = src_;