diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/song_table.inc | 6 | ||||
| -rw-r--r-- | sound/songs/midi/se_c_pasi.mid | bin | 0 -> 86 bytes | |||
| -rw-r--r-- | sound/songs/se_c_pasi.s | 45 |
5 files changed, 7 insertions, 49 deletions
diff --git a/ld_script.txt b/ld_script.txt index f13e04072..91c7c6e18 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -663,7 +663,7 @@ SECTIONS { sound/songs/midi/se_c_gaji.o(.rodata); sound/songs/midi/se_c_maku_u.o(.rodata); sound/songs/midi/se_c_maku_d.o(.rodata); - sound/songs/se_c_pasi.o(.rodata); + sound/songs/midi/se_c_pasi.o(.rodata); sound/songs/se_c_syu.o(.rodata); sound/songs/se_c_pikon.o(.rodata); sound/songs/se_reapoke.o(.rodata); @@ -819,5 +819,8 @@ $(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid $(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 +$(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -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 9c4aa1b63..deef7692d 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -98,9 +98,9 @@ gSongTable:: @ 86B49F0 song se_basabasa, 1, 1 @ Wing Attack song se_regi, 1, 1 @ Cash Register song se_c_gaji, 1, 1 @ Contest Hearts - song se_c_maku_u, 1, 1 @ Contest Curtain rise - song se_c_maku_d, 1, 1 @ Contest Curtain fall - song se_c_pasi, 1, 1 + song se_c_maku_u, 1, 1 @ Contest Curtain Rises + song se_c_maku_d, 1, 1 @ Contest Curtain Falls + song se_c_pasi, 1, 1 @ Contest Inflict Status song se_c_syu, 1, 1 song se_c_pikon, 1, 1 @ Pokémon Appears in Contest song se_reapoke, 1, 1 @ Shiny Pokémon diff --git a/sound/songs/midi/se_c_pasi.mid b/sound/songs/midi/se_c_pasi.mid Binary files differnew file mode 100644 index 000000000..eea9c5707 --- /dev/null +++ b/sound/songs/midi/se_c_pasi.mid diff --git a/sound/songs/se_c_pasi.s b/sound/songs/se_c_pasi.s deleted file mode 100644 index 02da29a6d..000000000 --- a/sound/songs/se_c_pasi.s +++ /dev/null @@ -1,45 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_pasi_grp, voicegroup128 - .equ se_c_pasi_pri, 5 - .equ se_c_pasi_rev, reverb_set+50 - .equ se_c_pasi_mvl, 127 - .equ se_c_pasi_key, 0 - .equ se_c_pasi_tbs, 1 - .equ se_c_pasi_exg, 0 - .equ se_c_pasi_cmp, 1 - - .section .rodata - .global se_c_pasi - .align 2 - -@********************** Track 1 **********************@ - -se_c_pasi_1: - .byte KEYSH , se_c_pasi_key+0 - .byte TEMPO , 150*se_c_pasi_tbs/2 - .byte VOICE , 2 - .byte BENDR , 12 - .byte VOL , 110*se_c_pasi_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , Gn3 , v112 - .byte W04 - .byte Gn4 , v064 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_pasi: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_pasi_pri @ Priority - .byte se_c_pasi_rev @ Reverb. - - .word se_c_pasi_grp - - .word se_c_pasi_1 - - .end |