From 2d6953b4408c92eef31355e627f8652d07d884e8 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Fri, 28 Sep 2018 23:51:36 -0400 Subject: [PATCH] Match mus_ooame.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_ooame.mid | Bin 0 -> 6379 bytes sound/songs/mus_ooame.s | 1117 -------------------------------- 5 files changed, 5 insertions(+), 1119 deletions(-) create mode 100644 sound/songs/midi/mus_ooame.mid delete mode 100644 sound/songs/mus_ooame.s diff --git a/ld_script.txt b/ld_script.txt index 047963b2c..e794c1d13 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -926,7 +926,7 @@ SECTIONS { sound/songs/midi/mus_contest0.o(.rodata); sound/songs/midi/mus_mgm0.o(.rodata); sound/songs/mus_t_battle.o(.rodata); - sound/songs/mus_ooame.o(.rodata); + sound/songs/midi/mus_ooame.o(.rodata); sound/songs/midi/mus_hideri.o(.rodata); sound/songs/mus_runecity.o(.rodata); sound/songs/midi/mus_con_k.o(.rodata); diff --git a/songs.mk b/songs.mk index 32f3642a4..e11765ba0 100644 --- a/songs.mk +++ b/songs.mk @@ -306,6 +306,9 @@ $(MID_SUBDIR)/mus_nibi.s: %.s: %.mid $(MID_SUBDIR)/mus_odamaki.s: %.s: %.mid $(MID) $< $@ -G033 -R$(STD_REVERB) -V080 +$(MID_SUBDIR)/mus_ooame.s: %.s: %.mid + $(MID) $< $@ -G089 -R$(STD_REVERB) -V080 + $(MID_SUBDIR)/mus_naminori.s: %.s: %.mid $(MID) $< $@ -G017 -R$(STD_REVERB) diff --git a/sound/song_table.inc b/sound/song_table.inc index fc92dc11c..832071701 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -447,7 +447,7 @@ gSongTable:: @ 86B49F0 song mus_contest0, 0, 0 @ Pokémon Contest! song mus_mgm0, 0, 0 @ Team Magma Appears! song mus_t_battle, 0, 0 @ Opening Battle - song mus_ooame, 0, 0 @ The Flood + song mus_ooame, 0, 0 @ Heavy Rain song mus_hideri, 0, 0 @ The Drought song mus_runecity, 0, 0 @ Sootopolis City song mus_con_k, 0, 0 @ Results Announcement diff --git a/sound/songs/midi/mus_ooame.mid b/sound/songs/midi/mus_ooame.mid new file mode 100644 index 0000000000000000000000000000000000000000..be847f6a643ceb56c4dcfe4ef161c710c1114d6f GIT binary patch literal 6379 zcmeHL+in|G6x}mD^&YHKWJQS>0WA>?w$)+C2~2=BEJY$&J{&&NVjK>4r7&s+O7Dx6F~ zZkm4Eq@VQ^kUE0p@ZnnI|FA~6hil6gZ(7XsrY~6^vOcKiBYQ5)9AtfXmHLq04Hf#m zOMAE*&INRKO8+llTcA9aj%&1CiNqea1+NM(ApSz|H^EkgXph&`O@fy*K}jJgh8eJ3Xf|1t&JWyF`k`!eLq;Av#UYdd7{)%h&CdS&p|dhk}5=)t!P z-sJ?feJ}6p13-Fr0B76*l+y$7vjccx2VloP?S3}<`dN4Zv!Av8e|znutxqlupXiSs zO^#n0T&Mgd?SSiquL;~6>e5&hI)%882WNsy17AXMZ|u~f>V#*iJR5Q~wnl`678f?aZgu@y1N5&!^Sl z^lz$vJULX_)IG82p^7J!d*y1SbMP1aN%RZO)WflEhP!i{;>S6f-kpmMqfF)7N-v(` zCwGg;gS&or?xpa@=Xoi3JZoPv-ewNn{5@;`j`=5pfBG|e+^0v!Ux4cMR;PXXl;TPx zA9;ZsVOv(dc;&@diAPwKW30*}tjY;KNsm?8_(jTJ##og{Se21SAP?dpV^xl^DjPqG ziM?+18wL}7ZcfHq?io0vrWcpk6dL|1Uq%fMxv>~-LE$TeUMxCmSXnv+iLP3W82&rBjV zB>h4${$%4RZrI6dSo@Ndm#o~v#Nl^%@G