From dabfa339c195ef1fa17b9e27a6749f5513b988cb Mon Sep 17 00:00:00 2001 From: Kermalis <29823718+Kermalis@users.noreply.github.com> Date: Tue, 2 Oct 2018 00:56:34 -0400 Subject: [PATCH] Match mus_rg_gym.mid --- ld_script.txt | 2 +- songs.mk | 3 + sound/song_table.inc | 2 +- sound/songs/midi/mus_rg_gym.mid | Bin 0 -> 7602 bytes sound/songs/mus_rg_gym.s | 1884 ------------------------------- 5 files changed, 5 insertions(+), 1886 deletions(-) create mode 100644 sound/songs/midi/mus_rg_gym.mid delete mode 100644 sound/songs/mus_rg_gym.s diff --git a/ld_script.txt b/ld_script.txt index edfc322d8..0fad21fa5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -970,7 +970,7 @@ SECTIONS { sound/songs/midi/mus_rg_annai.o(.rodata); sound/songs/mus_rg_slot.o(.rodata); sound/songs/midi/mus_rg_ajito.o(.rodata); - sound/songs/mus_rg_gym.o(.rodata); + sound/songs/midi/mus_rg_gym.o(.rodata); sound/songs/mus_rg_purin.o(.rodata); sound/songs/midi/mus_rg_demo.o(.rodata); sound/songs/mus_rg_title.o(.rodata); diff --git a/songs.mk b/songs.mk index d1520a50f..e344fea04 100644 --- a/songs.mk +++ b/songs.mk @@ -378,6 +378,9 @@ $(MID_SUBDIR)/mus_rg_get_yasei.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_guren.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G138 -V090 +$(MID_SUBDIR)/mus_rg_gym.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090 + $(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 ab2aedbe0..a6de3445b 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -491,7 +491,7 @@ gSongTable:: @ 86B49F0 song mus_rg_annai, 0, 0 @ Guide (FRLG) song mus_rg_slot, 0, 0 @ Game Corner song mus_rg_ajito, 0, 0 @ Rocket Hideout (FRLG) - song mus_rg_gym, 0, 0 @ Gym + song mus_rg_gym, 0, 0 @ Pokémon Gym (FRLG) song mus_rg_purin, 2, 2 @ Jigglypuff's Song song mus_rg_demo, 0, 0 @ Opening Movie (FRLG) song mus_rg_title, 0, 0 @ Title Screen diff --git a/sound/songs/midi/mus_rg_gym.mid b/sound/songs/midi/mus_rg_gym.mid new file mode 100644 index 0000000000000000000000000000000000000000..814e159ce74a46534191469e015c7d8a7207ada7 GIT binary patch literal 7602 zcmeI0TW?d@8HShHWNi{{6}lxPOQS};2#`jJ?3gW-G@h`ViO0lvTt^APP*)QPE~ZmU zlUAq~)o928dRNKuf&2agPlESlxU`KKxA`8%HfsppqG|7YHAS%{}8A$%e6Y8D%Ewj5t4tbdTMYGxncd<0r8^P|nkWHtrGy<{> zs8R1pa|`vJkJ}|Qe$d& ziJ&nUgG+3ql9$0{@I&y!0sSKKBJu*sFHnR*(Og7U`lZGs>m?XiUTJy5A>KSZ`PX@$ zXGL>kdun$BQw^+v8{26uZ-G?OyaiH0qF+Z=eXMRv`Y$cA56DXI)^8whU^l3Eq~>wF zHRKw0gQ9sC`7Z10+u7YZc$YZH{ge1F@%P)}FscT7kr0Q|Rc~)vcmo(9i^EJ+?q$FT zRDL=9bKqtCFXP|G0J-mijR`cNza-46Q5&@(*?X!@Mref6s5~Qv52uIGm}5do$p7#cz1O zzx-#&dq${!sy?fI3iUpH-}zr6-X->H7(*-f^SMMmYJR4w*}W<7GN}4&@^gM_-$v(p zoO;fqPY=w8+b1;_qjNnD?|Jr5^`qa1S>##zGmHN$^V-LYT6X=L!9Ih%j~BJv&vP`t zi{#}UUa4N(yQ0^bxF%lzd|f5})q&$Y_6PCemgr5M6F)g8Cdbw1#EyEjz2qU=T8)GK zRUujnvA4e&f<<=4 zp|h{%LtT0SKIOLv-y(c{wA0UeJ^i4{)$qy$R}y`wc+?@HvoA$~V_7rDa-nAL8;#>V zuB4Y@S+r^#EMAUU8z3)BttwchpKkp%)?Xv_Ypm1vkw(`4*sR~epO>j*eFd2p)MS0c zdUYK{tkd_E#(w;fxUDklc?D0_U#$iES4Eh_D`Hozw{cwD>Q2Z~(xJC{>qR(n@3UBeF*ER$D#;Pid6)B{W-Y_j(1A+@kb@$bqaO)i0MX_ z$jTmSd$B(GEG0v==2;4T8G9MOHE<2Q2{ISxL-dL-V7;__0t{Fmz-`vAW9MIjBu=S* z9=poH*o*M-?CGq6tKi4r$M6>G%hFP#dgmKs@h%E+qZVg0BqJ4MYyi)I7u@8kk{)pECfn2#1=S6eZxAC+mf z=AlIRmA{i$(W@4gvnJ1*px!DgS3q44sOnn>DZjG;@`pjETsHYu%f`M@4$+Iw=8pI5 z4Hwa)OqJI;D`L@&9t4kh7I!lbEpW#an58jUk?v;EXDQ5K z4!b6zQL5k^jZ)|ul_}ee&<${n%6I3`>y6Nja}8qS?puF&^~PDd)4O;X^s4brpV4_z z5c#S2nb`2;Zdkc$<+_z^oLs}oW?+(+EdS@?pF;eNnS3(6BbMs&Pt!s^;fFMc%HfXH zZ(2RbRjyr5v1-*bY{%dz%RtQgC*F@sK($_9nlHW z#F}lIYu-uhPOtsm9HPG|gZ%GWoyzlniEHa~`JaUE>oSKbnTPlLb=+xNs%JUS`#*g$ zUA7I1EoLo778fk$Ejm9pfH$nZYSA70nw9Gow=Lec_?g9lD^1UCXwNb?3VS$o>0o;2 z%VqGI7!GAFpFumv{=15|?RfjwzMfE1