diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/song_table.inc | 2 | ||||
| -rw-r--r-- | sound/songs/midi/mus_rg_kaihuku.mid | bin | 0 -> 151 bytes | |||
| -rw-r--r-- | sound/songs/mus_rg_kaihuku.s | 69 |
5 files changed, 5 insertions, 71 deletions
diff --git a/ld_script.txt b/ld_script.txt index 33f1bedfa..c2626266b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -976,7 +976,7 @@ SECTIONS { sound/songs/mus_rg_title.o(.rodata); sound/songs/midi/mus_rg_guren.o(.rodata); sound/songs/mus_rg_shion.o(.rodata); - sound/songs/mus_rg_kaihuku.o(.rodata); + sound/songs/midi/mus_rg_kaihuku.o(.rodata); sound/songs/midi/mus_rg_cycling.o(.rodata); sound/songs/mus_rg_rocket.o(.rodata); sound/songs/mus_rg_shoujo.o(.rodata); @@ -387,6 +387,9 @@ $(MID_SUBDIR)/mus_rg_hanada.s: %.s: %.mid $(MID_SUBDIR)/mus_rg_jump.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 +$(MID_SUBDIR)/mus_rg_kaihuku.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G140 -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 dd8bbeb8a..40500faf3 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -497,7 +497,7 @@ gSongTable:: @ 86B49F0 song mus_rg_title, 0, 0 @ Title Screen song mus_rg_guren, 0, 0 @ Cinnabar Island Theme (FRLG) song mus_rg_shion, 0, 0 @ Lavender Town - song mus_rg_kaihuku, 0, 0 @ RBY Pokémon Center Healing + 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 @ Encounter! Team Rocket song mus_rg_shoujo, 0, 0 @ Encounter! Girl diff --git a/sound/songs/midi/mus_rg_kaihuku.mid b/sound/songs/midi/mus_rg_kaihuku.mid Binary files differnew file mode 100644 index 000000000..50c96d7c6 --- /dev/null +++ b/sound/songs/midi/mus_rg_kaihuku.mid diff --git a/sound/songs/mus_rg_kaihuku.s b/sound/songs/mus_rg_kaihuku.s deleted file mode 100644 index cc8628588..000000000 --- a/sound/songs/mus_rg_kaihuku.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "MPlayDef.s" - - .equ mus_rg_kaihuku_grp, voicegroup140 - .equ mus_rg_kaihuku_pri, 0 - .equ mus_rg_kaihuku_rev, reverb_set+50 - .equ mus_rg_kaihuku_mvl, 127 - .equ mus_rg_kaihuku_key, 0 - .equ mus_rg_kaihuku_tbs, 1 - .equ mus_rg_kaihuku_exg, 0 - .equ mus_rg_kaihuku_cmp, 1 - - .section .rodata - .global mus_rg_kaihuku - .align 2 - -@********************** Track 1 **********************@ - -mus_rg_kaihuku_1: - .byte VOL , 90*mus_rg_kaihuku_mvl/mxv - .byte KEYSH , mus_rg_kaihuku_key+0 - .byte TEMPO , 146*mus_rg_kaihuku_tbs/2 - .byte VOICE , 2 - .byte N24 , Bn4 , v064 - .byte W24 - .byte N24 - .byte W24 - .byte N12 - .byte W12 - .byte Gs4 - .byte W12 - .byte N48 , En5 - .byte W24 - .byte W24 - .byte FINE - -@********************** Track 2 **********************@ - -mus_rg_kaihuku_2: - .byte VOL , 90*mus_rg_kaihuku_mvl/mxv - .byte KEYSH , mus_rg_kaihuku_key+0 - .byte VOICE , 3 - .byte N12 , En2 , v092 - .byte W24 - .byte N12 - .byte W24 - .byte N12 - .byte W12 - .byte Gs2 - .byte W12 - .byte N36 , En2 - .byte W24 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -mus_rg_kaihuku: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte mus_rg_kaihuku_pri @ Priority - .byte mus_rg_kaihuku_rev @ Reverb. - - .word mus_rg_kaihuku_grp - - .word mus_rg_kaihuku_1 - .word mus_rg_kaihuku_2 - - .end |