diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:09:46 -0400 |
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-10-10 16:09:46 -0400 |
| commit | 937e9d05e8fa19237cbd4c7dbf59d2fa52269d7d (patch) | |
| tree | 0c462cc741d789029aa1fe082bc486075b522532 | |
| parent | da9b55ea616961ec2e41d3d9b630e22c828f1b9f (diff) | |
Match se_hi_turun.mid
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/song_table.inc | 4 | ||||
| -rw-r--r-- | sound/songs/midi/se_hi_turun.mid | bin | 0 -> 132 bytes | |||
| -rw-r--r-- | sound/songs/se_hi_turun.s | 62 |
5 files changed, 6 insertions, 65 deletions
diff --git a/ld_script.txt b/ld_script.txt index f6e3f9044..992cba967 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -612,7 +612,7 @@ SECTIONS { sound/songs/se_tk_warpin.o(.rodata); sound/songs/se_tk_warpout.o(.rodata); sound/songs/se_tu_saa.o(.rodata); - sound/songs/se_hi_turun.o(.rodata); + sound/songs/midi/se_hi_turun.o(.rodata); sound/songs/se_track_move.o(.rodata); sound/songs/se_track_stop.o(.rodata); sound/songs/se_track_haiki.o(.rodata); @@ -897,5 +897,8 @@ $(MID_SUBDIR)/se_hashi.s: %.s: %.mid $(MID_SUBDIR)/se_hazure.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 +$(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -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 5d71dd57f..1ba64a712 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -40,7 +40,7 @@ gSongTable:: @ 86B49F0 song se_tk_kasya, 1, 1 @ Mossdeep Gym/Trick House Switch song se_fu_zaku, 1, 1 song se_fu_zaku2, 1, 1 - song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym Warp + song se_fu_zuzuzu, 1, 1 @ Lavaridge Gym - Warp song se_ru_gashin, 1, 1 @ Sootopolis Gym - Stairs Appear song se_ru_gasyan, 1, 1 @ Sootopolis Gym - Ice Breaking song se_ru_bari, 1, 1 @ Sootopolis Gym - Walking on Ice @@ -49,7 +49,7 @@ gSongTable:: @ 86B49F0 song se_tk_warpin, 1, 1 @ Warp In song se_tk_warpout, 1, 1 @ Warp Out song se_tu_saa, 1, 1 @ Repel - song se_hi_turun, 1, 1 @ Moving Obstacle in Fortree Gym + song se_hi_turun, 1, 1 @ Fortree Gym - Obstacle song se_track_move, 1, 1 @ Moving Truck song se_track_stop, 1, 1 @ Moving Truck Stop song se_track_haiki, 2, 2 @ Moving Truck Unload diff --git a/sound/songs/midi/se_hi_turun.mid b/sound/songs/midi/se_hi_turun.mid Binary files differnew file mode 100644 index 000000000..2a09f6c55 --- /dev/null +++ b/sound/songs/midi/se_hi_turun.mid diff --git a/sound/songs/se_hi_turun.s b/sound/songs/se_hi_turun.s deleted file mode 100644 index ab51f35cd..000000000 --- a/sound/songs/se_hi_turun.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hi_turun_grp, voicegroup128 - .equ se_hi_turun_pri, 4 - .equ se_hi_turun_rev, reverb_set+50 - .equ se_hi_turun_mvl, 127 - .equ se_hi_turun_key, 0 - .equ se_hi_turun_tbs, 1 - .equ se_hi_turun_exg, 0 - .equ se_hi_turun_cmp, 1 - - .section .rodata - .global se_hi_turun - .align 2 - -@********************** Track 1 **********************@ - -se_hi_turun_1: - .byte KEYSH , se_hi_turun_key+0 - .byte TEMPO , 220*se_hi_turun_tbs/2 - .byte VOICE , 9 - .byte VOL , 90*se_hi_turun_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 , v112 - .byte W03 - .byte Dn4 - .byte W03 - .byte Gn4 - .byte W03 - .byte N21 , Gn5 - .byte W03 - .byte W03 - .byte VOL , 81*se_hi_turun_mvl/mxv - .byte BEND , c_v+6 - .byte W03 - .byte VOL , 72*se_hi_turun_mvl/mxv - .byte BEND , c_v+20 - .byte W03 - .byte VOL , 46*se_hi_turun_mvl/mxv - .byte BEND , c_v+37 - .byte W03 - .byte VOL , 24*se_hi_turun_mvl/mxv - .byte BEND , c_v+63 - .byte W03 - .byte VOL , 7*se_hi_turun_mvl/mxv - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_hi_turun: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_hi_turun_pri @ Priority - .byte se_hi_turun_rev @ Reverb. - - .word se_hi_turun_grp - - .word se_hi_turun_1 - - .end |