diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:23:09 -0500 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-11-20 17:23:09 -0500 |
| commit | 3eff7efd8f0e5dc27ddf8c7c90a8fa1b287a933d (patch) | |
| tree | e754fe0970cc24ebe8ac283f11745e760f339c40 | |
| parent | d00ae0da559b877c05cf0faff9f07fd12001183c (diff) | |
Match se_rg_getting.mid
| -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/se_rg_getting.mid | bin | 0 -> 119 bytes | |||
| -rw-r--r-- | sound/songs/se_rg_getting.s | 69 |
5 files changed, 5 insertions, 71 deletions
diff --git a/ld_script.txt b/ld_script.txt index af50e003e..b7516fc1e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -869,7 +869,7 @@ SECTIONS { sound/songs/midi/se_rg_card3.o(.rodata); sound/songs/midi/se_rg_bag1.o(.rodata); sound/songs/midi/se_rg_bag2.o(.rodata); - sound/songs/se_rg_getting.o(.rodata); + sound/songs/midi/se_rg_getting.o(.rodata); sound/songs/se_rg_shop.o(.rodata); sound/songs/se_rg_kiteki.o(.rodata); sound/songs/se_rg_help_op.o(.rodata); @@ -1029,5 +1029,8 @@ $(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid $(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 +$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/song_table.inc b/sound/song_table.inc index 9b4564e22..8a6a675c9 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -255,7 +255,7 @@ gSongTable:: @ 86B49F0 song se_rg_card3, 1, 1 @ Trainer Card 3 (FRLG) song se_rg_bag1, 1, 1 @ Bag Scroll (FRLG) song se_rg_bag2, 1, 1 @ Bag Pocket Change (FRLG) - song se_rg_getting, 1, 1 + song se_rg_getting, 1, 1 song se_rg_shop, 1, 1 @ Cash Register (FRLG) song se_rg_kiteki, 1, 1 @ S.S. Anne Horn (FRLG) song se_rg_help_op, 1, 1 @ Help Menu Open (FRLG) diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_getting.mid Binary files differnew file mode 100644 index 000000000..f8bf4b38f --- /dev/null +++ b/sound/songs/midi/se_rg_getting.mid diff --git a/sound/songs/se_rg_getting.s b/sound/songs/se_rg_getting.s deleted file mode 100644 index 2c632f399..000000000 --- a/sound/songs/se_rg_getting.s +++ /dev/null @@ -1,69 +0,0 @@ - .include "MPlayDef.s" - - .equ se_rg_getting_grp, voicegroup129 - .equ se_rg_getting_pri, 5 - .equ se_rg_getting_rev, reverb_set+50 - .equ se_rg_getting_mvl, 127 - .equ se_rg_getting_key, 0 - .equ se_rg_getting_tbs, 1 - .equ se_rg_getting_exg, 0 - .equ se_rg_getting_cmp, 1 - - .section .rodata - .global se_rg_getting - .align 2 - -@********************** Track 1 **********************@ - -se_rg_getting_1: - .byte KEYSH , se_rg_getting_key+0 - .byte TEMPO , 310*se_rg_getting_tbs/2 - .byte VOICE , 3 - .byte XCMD , xIECV , 8 - .byte xIECL , 8 - .byte VOL , 100*se_rg_getting_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Bn3 , v120 - .byte W03 - .byte W03 - .byte W02 - .byte En4 , v127 - .byte W01 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_rg_getting_2: - .byte KEYSH , se_rg_getting_key+0 - .byte VOICE , 126 - .byte VOL , 100*se_rg_getting_mvl/mxv - .byte W03 - .byte W01 - .byte N01 , Cn2 , v120 - .byte W02 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_rg_getting: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_rg_getting_pri @ Priority - .byte se_rg_getting_rev @ Reverb. - - .word se_rg_getting_grp - - .word se_rg_getting_1 - .word se_rg_getting_2 - - .end |