From a2e816b33adac6f83ffb5959e45bdcbc91d40973 Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Wed, 26 Sep 2018 19:04:26 -0400 Subject: [PATCH] Match mus_girleye.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_girleye.mid | Bin 0 -> 4282 bytes sound/songs/mus_girleye.s | 1267 ------------------------------ 5 files changed, 5 insertions(+), 1269 deletions(-) create mode 100644 sound/songs/midi/mus_girleye.mid delete mode 100644 sound/songs/mus_girleye.s diff --git a/ld_script.txt b/ld_script.txt index ce532f0b70..aa07333c56 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -890,7 +890,7 @@ SECTIONS { sound/songs/midi/mus_friendly.o(.rodata); sound/songs/mus_mishiro.o(.rodata); sound/songs/mus_tozan.o(.rodata); - sound/songs/mus_girleye.o(.rodata); + sound/songs/midi/mus_girleye.o(.rodata); sound/songs/mus_minamo.o(.rodata); sound/songs/midi/mus_ashroad.o(.rodata); sound/songs/midi/mus_event0.o(.rodata); diff --git a/songs.mk b/songs.mk index 7446147fc0..d53843f992 100644 --- a/songs.mk +++ b/songs.mk @@ -174,6 +174,9 @@ $(MID_SUBDIR)/mus_gim.s: %.s: %.mid $(MID_SUBDIR)/mus_girl_sup.s: %.s: %.mid $(MID) $< $@ -G061 -R$(STD_REVERB) +$(MID_SUBDIR)/mus_girleye.s: %.s: %.mid + $(MID) $< $@ -G053 -R$(STD_REVERB) + $(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 c23895e1a2..0f5b3ca640 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -411,7 +411,7 @@ gSongTable:: @ 86B49F0 song mus_friendly, 0, 0 @ Poké Mart song mus_mishiro, 0, 0 @ Littleroot Town song mus_tozan, 0, 0 @ Sky Pillar - song mus_girleye, 0, 0 @ Encounter! Girl + song mus_girleye, 0, 0 @ Trainers' Eyes Meet (Lass) song mus_minamo, 0, 0 @ Lilycove City song mus_ashroad, 0, 0 @ Route 111 song mus_event0, 0, 0 @ H-Help Me! diff --git a/sound/songs/midi/mus_girleye.mid b/sound/songs/midi/mus_girleye.mid new file mode 100644 index 0000000000000000000000000000000000000000..7835f1efaee2c5e900af6146bb2070abeef9c1f7 GIT binary patch literal 4282 zcmds3T~icC6umP&%oS=alT9!y1VqJ;2r5dj5JA2cTqMZu3W9>T3aPRxK1}5)Z;G(s zBOnX>jF3o3-jbM@NA&vO&|XeXm88c*kTd}m^g@c$0&oTD(yJwZP@^fh-<1=+NnmfF9`^#ff!!r`61K$qfnok$dk}tIg=^+5xXS6IOCAtuIq!pk7C8X2f;fCUb|NVuuJzW1zYyc z?xD5qe5~L0wYN@g_q2RYKMl}kWuu%HK0|*}S8n-sO3mITTAoO&*$Lp}q?(-s-pQ%i zJHV+xZSrB4>l7dLoHF8imrp1@rTC1;pSs+txW(biE?;!GQ_W5hZ8{|E%Tsl}m|!qi zr^CxLfttm6U!I14x+FdcTUQ=2m4UL}`X>T^lWSbA^+eBM=uv!3OFHgqJy7EDC6_xC zcPZ}iq#rA00%D{+kc0>^Vn@Z;_$}n!Lj3l)84pnML%%O$(Y%T+8=;l$7`x-u>d>fWxld(Z|GYYiIP4k+rk+NR8a?gH;h{d&=Y`p0#t zMvu?Ad>&I#-0C?@vP$H)x*!wvN?p>s~;e3#fAzcvcWP&Y~Y{x1gUE9ar$H62H>^ z7W5OwW8r$kW9wL+Cit7cW9x?f`bE19b=q`X=A(??U1`G{+sHv(YD1|uDi@WOCCYvt zRnF7yhSCbXaOhjv(B{N5yldw0u6c%M_Z*(x&&GgbKGMuBM7dxz+0_HGiFGbvUi& zhk@xyHJ=7%a%w&U%sxmwcQ`hmC3=o)u$ry&<@aiK#$cV&_Bhs$!#|ex=h571HW$Xz z$kTiyh7Ty~(};_II9IRvQCss5gI{zEBd!trf>C}OA41*`;@8JbA3(_u{r+ke{YbqL z;0SOu7xpu1>W!ive#39j*tUy63*!?X&LWQxw-Qp^TYZND3u2lSi;{6`) zclm(B2g>+;kK?X55lVPm<#M&+TE&O;_K5Lt@1eFg@KgH(NSPGmz*>iSk1pe@spp-drAws`rFeRAITVm*YLI>F{3H^mvcw@eNk6_Ep$d z4Sni$^hIuV$|{9Q)7#~i4xb5meAX0jMf13#1#6o;t$yHN=`q=a9)_qN0*xLNP!9?y z!-#fc?SUYs<8NDMWm(yMK|GJI%U5_`&GV7Bd${o8d+E@3+#+8+Yhz#e3pfpH(~o)< zrYZ3<8(YI8X`!7g#*OVq{8Y3rBmXk;LyQ~r4O%}HZ9MuGI*=b?+@Noe-h#0;G`P@< z^&$GNU}r!Q!hON6nkcQc!PQ2-!IE)|(r;R33Etmf|niUSM;{q>YI@>VU zrysi8T&0ihM~V;Pk2&FUm6H2~%P1d&N`DZR$p^Mx`VjpH zTEEq|%h!W-Jtb$&{hNM&MBmFh@<`K0CUBl+sB9zC^#;^&cO#RMI52Hc=fk%6nekh+ z>nwkh;n#80YYgpV;66=~voX}Ap5lgXWZsY$*2g*t1Hg4D1K5bv`O6SA>