diff options
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | songs.mk | 3 | ||||
| -rw-r--r-- | sound/songs/midi/se_track_haiki.mid | bin | 0 -> 76 bytes | |||
| -rw-r--r-- | sound/songs/se_track_haiki.s | 49 |
4 files changed, 4 insertions, 50 deletions
diff --git a/ld_script.txt b/ld_script.txt index 22f2214b6..ba1054eb5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -685,7 +685,7 @@ SECTIONS { 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); + sound/songs/midi/se_track_haiki.o(.rodata); sound/songs/midi/se_track_door.o(.rodata); sound/songs/midi/se_moter.o(.rodata); sound/songs/midi/se_card.o(.rodata); @@ -1170,5 +1170,8 @@ $(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid $(MID_SUBDIR)/se_track_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 +$(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 + $(MID_SUBDIR)/se_z_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_track_haiki.mid Binary files differnew file mode 100644 index 000000000..42db7fd0e --- /dev/null +++ b/sound/songs/midi/se_track_haiki.mid diff --git a/sound/songs/se_track_haiki.s b/sound/songs/se_track_haiki.s deleted file mode 100644 index 88737eb88..000000000 --- a/sound/songs/se_track_haiki.s +++ /dev/null @@ -1,49 +0,0 @@ - .include "MPlayDef.s" - - .equ se_track_haiki_grp, voicegroup127 - .equ se_track_haiki_pri, 4 - .equ se_track_haiki_rev, reverb_set+50 - .equ se_track_haiki_mvl, 127 - .equ se_track_haiki_key, 0 - .equ se_track_haiki_tbs, 1 - .equ se_track_haiki_exg, 0 - .equ se_track_haiki_cmp, 1 - - .section .rodata - .global se_track_haiki - .align 2 - -@********************** Track 1 **********************@ - -se_track_haiki_1: - .byte KEYSH , se_track_haiki_key+0 - .byte TEMPO , 150*se_track_haiki_tbs/2 - .byte VOICE , 120 - .byte VOL , 127*se_track_haiki_mvl/mxv - .byte N06 , Bn3 , v028 - .byte W03 - .byte W03 - .byte N21 , Gs4 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_track_haiki: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_track_haiki_pri @ Priority - .byte se_track_haiki_rev @ Reverb. - - .word se_track_haiki_grp - - .word se_track_haiki_1 - - .end |