From 2811370ac0660692019d5aaf1fb233e4ad57c16f Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 21:27:13 -0400 Subject: [PATCH] Match mus_rg_shoujo.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_shoujo.mid | Bin 0 -> 2125 bytes sound/songs/mus_rg_shoujo.s | 693 ----------------------------- 5 files changed, 5 insertions(+), 695 deletions(-) create mode 100644 sound/songs/midi/mus_rg_shoujo.mid delete mode 100644 sound/songs/mus_rg_shoujo.s diff --git a/ld_script.txt b/ld_script.txt index e70b3b909..5cec3ef3b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -979,7 +979,7 @@ SECTIONS { sound/songs/midi/mus_rg_kaihuku.o(.rodata); sound/songs/midi/mus_rg_cycling.o(.rodata); sound/songs/midi/mus_rg_rocket.o(.rodata); - sound/songs/mus_rg_shoujo.o(.rodata); + sound/songs/midi/mus_rg_shoujo.o(.rodata); sound/songs/mus_rg_shounen.o(.rodata); sound/songs/midi/mus_rg_dendou.o(.rodata); sound/songs/mus_rg_t_mori.o(.rodata); diff --git a/songs.mk b/songs.mk index 5af3ad30e..84a92c8b7 100644 --- a/songs.mk +++ b/songs.mk @@ -492,6 +492,9 @@ $(MID_SUBDIR)/mus_rg_shion.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_shiruhu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G166 -V076 +$(MID_SUBDIR)/mus_rg_shoujo.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G143 -V051 + $(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078 diff --git a/sound/song_table.inc b/sound/song_table.inc index 67bb309c8..80d76fea1 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -500,7 +500,7 @@ gSongTable:: @ 86B49F0 song mus_rg_kaihuku, 0, 0 @ Pokémon Healed (2) (FRLG) song mus_rg_cycling, 0, 0 @ Cycling (FRLG) song mus_rg_rocket, 0, 0 @ A Trainer Appears (Bad Guy Version) (FRLG) - song mus_rg_shoujo, 0, 0 @ Encounter! Girl + song mus_rg_shoujo, 0, 0 @ A Trainer Appears (Girl Version) (FRLG) song mus_rg_shounen, 0, 0 @ Encounter! Boy song mus_rg_dendou, 0, 0 @ Hall of Fame (FRLG) song mus_rg_t_mori, 0, 0 @ Viridian Forest diff --git a/sound/songs/midi/mus_rg_shoujo.mid b/sound/songs/midi/mus_rg_shoujo.mid new file mode 100644 index 0000000000000000000000000000000000000000..48ede9b4c8b7357a30c475faeddfc7a536e2333c GIT binary patch literal 2125 zcmbtVO>Yxd6g@95nHSryQfoD;7l2eDg`gm6RY-J!MC=eUP3#zpK_D!Ig^;k+1x>pd zsZuA7!^hG#!QmgklB6W4SwcrOrYGhYR z$hO@;ueeCH=Nac2=NRW0F9dew0??i%p2Y;CWwiTnk@+I?Mdpjl4`a0Fe24v?o`LxRol0Pv6`)fK+-41UnF}drQ)wrpHx*NE zT{T^dOC0H34)Y_~=4HuyqW6aMnZAyFVqJxOD#&!IqOXd+5@_2HhaZplw=nIn#wN}03P zT(ss2l(FWPHOqFDW*Qy!e$Llx=P`N`}}q7DA*o1a7T@0?{i6r(c@M{c`o`OPkldc zdyA6iGDmvXSL~H}D?dCBy;