diff options
| -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_hantei1.mid | bin | 0 -> 105 bytes | |||
| -rw-r--r-- | sound/songs/se_hantei1.s | 58 |
5 files changed, 6 insertions, 61 deletions
diff --git a/ld_script.txt b/ld_script.txt index c2c122a1a..0ef95f865 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -829,7 +829,7 @@ SECTIONS { sound/songs/se_rg_nawamiss.o(.rodata); sound/songs/se_toreeye.o(.rodata); sound/songs/se_toreoff.o(.rodata); - sound/songs/se_hantei1.o(.rodata); + sound/songs/midi/se_hantei1.o(.rodata); sound/songs/se_hantei2.o(.rodata); sound/songs/midi/se_curtain.o(.rodata); sound/songs/midi/se_curtain1.o(.rodata); @@ -885,5 +885,8 @@ $(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid $(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 +$(MID_SUBDIR)/se_hantei1.s: %.s: %.mid + $(MID) $< $@ -E -R$(STD_REVERB) -G129 -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 d599ffa45..1fddaefd7 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -266,8 +266,8 @@ gSongTable:: @ 86B49F0 song se_rg_nawamiss, 1, 1 song se_toreeye, 1, 1 @ Trainer's Eye Call song se_toreoff, 1, 1 @ Trainer's Eye Hang Up - song se_hantei1, 1, 1 @ Battle Arena Time's Up 1 - song se_hantei2, 1, 1 @ Battle Arena Time's Up 2 + song se_hantei1, 1, 1 @ Battle Arena - Judgment 1 + song se_hantei2, 1, 1 @ Battle Arena - Judgment 2 song se_curtain, 1, 1 @ Battle Pike - Curtain Opens song se_curtain1, 1, 1 @ Battle Pike - Curtain Closes song se_ussoki, 1, 1 @ Sudowoodo diff --git a/sound/songs/midi/se_hantei1.mid b/sound/songs/midi/se_hantei1.mid Binary files differnew file mode 100644 index 000000000..1f2855420 --- /dev/null +++ b/sound/songs/midi/se_hantei1.mid diff --git a/sound/songs/se_hantei1.s b/sound/songs/se_hantei1.s deleted file mode 100644 index 5ef302ee6..000000000 --- a/sound/songs/se_hantei1.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_hantei1_grp, voicegroup129 - .equ se_hantei1_pri, 5 - .equ se_hantei1_rev, reverb_set+50 - .equ se_hantei1_mvl, 127 - .equ se_hantei1_key, 0 - .equ se_hantei1_tbs, 1 - .equ se_hantei1_exg, 0 - .equ se_hantei1_cmp, 1 - - .section .rodata - .global se_hantei1 - .align 2 - -@********************** Track 1 **********************@ - -se_hantei1_1: - .byte KEYSH , se_hantei1_key+0 - .byte TEMPO , 92*se_hantei1_tbs/2 - .byte VOICE , 116 - .byte VOL , 127*se_hantei1_mvl/mxv - .byte PAN , c_v-62 - .byte N32 , Fn3 , v127 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@********************** Track 2 **********************@ - -se_hantei1_2: - .byte KEYSH , se_hantei1_key+0 - .byte VOICE , 117 - .byte VOL , 127*se_hantei1_mvl/mxv - .byte PAN , c_v+63 - .byte BEND , c_v+1 - .byte N32 , An3 , v100 - .byte W12 - .byte W12 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_hantei1: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_hantei1_pri @ Priority - .byte se_hantei1_rev @ Reverb. - - .word se_hantei1_grp - - .word se_hantei1_1 - .word se_hantei1_2 - - .end |