diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:56:12 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 14:56:12 -0400 |
| commit | c98f5c25d674227b8d73273dab2b7980224f9d44 (patch) | |
| tree | 312d0c9d3088ecd382978b9f0d2fa712e64afcc2 | |
| parent | b9989eaa562fab3e6c5da7c693417135497f440f (diff) | |
Match se_c_pikon.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/song_table.inc | 10 | ||||
| -rw-r--r-- | sound/songs/midi/se_c_pikon.mid | bin | 0 -> 112 bytes | |||
| -rw-r--r-- | sound/songs/se_c_pikon.s | 54 |
5 files changed, 9 insertions, 60 deletions
diff --git a/ld_script.txt b/ld_script.txt index 91c7c6e18..b0d2cc476 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -665,7 +665,7 @@ SECTIONS { sound/songs/midi/se_c_maku_d.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/midi/se_c_pikon.o(.rodata); sound/songs/se_reapoke.o(.rodata); sound/songs/se_op_basyu.o(.rodata); sound/songs/midi/se_bt_start.o(.rodata); @@ -822,5 +822,8 @@ $(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid $(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 +$(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -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 deef7692d..141105739 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -97,12 +97,12 @@ gSongTable:: @ 86B49F0 song se_tamakoro_e, 2, 2 @ Roulette Ball 2 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 Rises - song se_c_maku_d, 1, 1 @ Contest Curtain Falls - song se_c_pasi, 1, 1 @ Contest Inflict Status + song se_c_gaji, 1, 1 @ Contest - Hearts + 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_c_pikon, 1, 1 @ Contest - Pokémon Switches In song se_reapoke, 1, 1 @ Shiny Pokémon song se_op_basyu, 1, 1 @ Opening Movie -> Title Screen whoosh song se_bt_start, 1, 1 @ Battle Mugshot whoosh diff --git a/sound/songs/midi/se_c_pikon.mid b/sound/songs/midi/se_c_pikon.mid Binary files differnew file mode 100644 index 000000000..718a61443 --- /dev/null +++ b/sound/songs/midi/se_c_pikon.mid diff --git a/sound/songs/se_c_pikon.s b/sound/songs/se_c_pikon.s deleted file mode 100644 index 1e91ed760..000000000 --- a/sound/songs/se_c_pikon.s +++ /dev/null @@ -1,54 +0,0 @@ - .include "MPlayDef.s" - - .equ se_c_pikon_grp, voicegroup128 - .equ se_c_pikon_pri, 5 - .equ se_c_pikon_rev, reverb_set+50 - .equ se_c_pikon_mvl, 127 - .equ se_c_pikon_key, 0 - .equ se_c_pikon_tbs, 1 - .equ se_c_pikon_exg, 0 - .equ se_c_pikon_cmp, 1 - - .section .rodata - .global se_c_pikon - .align 2 - -@********************** Track 1 **********************@ - -se_c_pikon_1: - .byte KEYSH , se_c_pikon_key+0 - .byte TEMPO , 150*se_c_pikon_tbs/2 - .byte VOICE , 14 - .byte VOL , 90*se_c_pikon_mvl/mxv - .byte BEND , c_v-7 - .byte N02 , Cn5 , v112 - .byte W02 - .byte Cn6 - .byte W04 - .byte W01 - .byte Cn6 , v060 - .byte W05 - .byte W02 - .byte Cn5 , v112 - .byte W02 - .byte Cn6 - .byte W02 - .byte W03 - .byte Cn6 , v060 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_c_pikon: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_c_pikon_pri @ Priority - .byte se_c_pikon_rev @ Reverb. - - .word se_c_pikon_grp - - .word se_c_pikon_1 - - .end |