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] 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 08583e6fe3..9844b89486 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 ece0a9e7c3..06a091f823 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 57f30657cd..fe714bf8c7 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 55145fe3b5..0000000000
--- 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