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/se_jyuni.mid | bin | 0 -> 267 bytes | |||
| -rw-r--r-- | sound/songs/se_jyuni.s | 127 |
5 files changed, 5 insertions, 129 deletions
diff --git a/ld_script.txt b/ld_script.txt index 436c717ae..1c1ff43ea 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -588,7 +588,7 @@ SECTIONS { sound/songs/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); sound/songs/midi/se_bowa.o(.rodata); - sound/songs/se_jyuni.o(.rodata); + sound/songs/midi/se_jyuni.o(.rodata); sound/songs/midi/se_a.o(.rodata); sound/songs/midi/se_i.o(.rodata); sound/songs/se_u.o(.rodata); @@ -918,5 +918,8 @@ $(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid $(MID_SUBDIR)/se_jitensya.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 +$(MID_SUBDIR)/se_jyuni.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 + $(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 1ba64a712..5b5813ab2 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -25,7 +25,7 @@ gSongTable:: @ 86B49F0 song se_pin, 1, 1 @ Exclamation Bubble song se_boo, 1, 1 @ Contest Jam song se_bowa, 1, 1 @ Giving Poké Ball to Nurse, Poké Ball Wiggle - song se_jyuni, 2, 2 @ Places in Contest Appearing + song se_jyuni, 2, 2 @ Contest - Rankings Revealed song se_a, 1, 1 @ Bard A song se_i, 1, 1 @ Bard I song se_u, 1, 1 @ Bard U diff --git a/sound/songs/midi/se_jyuni.mid b/sound/songs/midi/se_jyuni.mid Binary files differnew file mode 100644 index 000000000..f68a31e46 --- /dev/null +++ b/sound/songs/midi/se_jyuni.mid diff --git a/sound/songs/se_jyuni.s b/sound/songs/se_jyuni.s deleted file mode 100644 index 1267e7f35..000000000 --- a/sound/songs/se_jyuni.s +++ /dev/null @@ -1,127 +0,0 @@ - .include "MPlayDef.s" - - .equ se_jyuni_grp, voicegroup127 - .equ se_jyuni_pri, 4 - .equ se_jyuni_rev, reverb_set+50 - .equ se_jyuni_mvl, 127 - .equ se_jyuni_key, 0 - .equ se_jyuni_tbs, 1 - .equ se_jyuni_exg, 0 - .equ se_jyuni_cmp, 1 - - .section .rodata - .global se_jyuni - .align 2 - -@********************** Track 1 **********************@ - -se_jyuni_1: - .byte KEYSH , se_jyuni_key+0 - .byte TEMPO , 144*se_jyuni_tbs/2 - .byte VOICE , 48 - .byte PAN , c_v+1 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte N06 , Cn3 , v060 - .byte W06 - .byte N13 , Gn3 - .byte W06 - .byte W01 - .byte VOL , 105*se_jyuni_mvl/mxv - .byte W01 - .byte 100*se_jyuni_mvl/mxv - .byte W01 - .byte 89*se_jyuni_mvl/mxv - .byte W01 - .byte 72*se_jyuni_mvl/mxv - .byte W02 - .byte 55*se_jyuni_mvl/mxv - .byte W01 - .byte 38*se_jyuni_mvl/mxv - .byte W01 - .byte 22*se_jyuni_mvl/mxv - .byte W01 - .byte 110*se_jyuni_mvl/mxv - .byte N12 , Gn3 , v032 - .byte W03 - .byte W01 - .byte VOL , 100*se_jyuni_mvl/mxv - .byte W01 - .byte 91*se_jyuni_mvl/mxv - .byte W01 - .byte 75*se_jyuni_mvl/mxv - .byte W01 - .byte 43*se_jyuni_mvl/mxv - .byte W02 - .byte 24*se_jyuni_mvl/mxv - .byte W01 - .byte 9*se_jyuni_mvl/mxv - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_jyuni_2: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 80 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Cn3 , v060 - .byte W06 - .byte N13 , Gn3 - .byte W06 - .byte W09 - .byte PAN , c_v-48 - .byte N12 , Gn3 , v032 - .byte W03 - .byte W12 - .byte FINE - -@********************** Track 3 **********************@ - -se_jyuni_3: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 81 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte PAN , c_v+0 - .byte N06 , Gn2 , v060 - .byte W06 - .byte N13 , Cn3 - .byte W06 - .byte W09 - .byte PAN , c_v+48 - .byte N12 , Cn3 , v032 - .byte W03 - .byte W12 - .byte FINE - -@********************** Track 4 **********************@ - -se_jyuni_4: - .byte KEYSH , se_jyuni_key+0 - .byte VOICE , 47 - .byte VOL , 110*se_jyuni_mvl/mxv - .byte N06 , Gn1 , v127 - .byte W06 - .byte N13 , Cn2 - .byte W06 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_jyuni: - .byte 4 @ NumTrks - .byte 0 @ NumBlks - .byte se_jyuni_pri @ Priority - .byte se_jyuni_rev @ Reverb. - - .word se_jyuni_grp - - .word se_jyuni_1 - .word se_jyuni_2 - .word se_jyuni_3 - .word se_jyuni_4 - - .end |