summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 17:20:31 -0500
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-11-20 17:20:31 -0500
commitd00ae0da559b877c05cf0faff9f07fd12001183c (patch)
tree854d79a9f56ff6c750505fdd3ec1b348408f46e8 /sound
parentf2bb46c960f02e9a542621d3309daf9391cade07 (diff)
Match se_rg_excellent.mid
Diffstat (limited to 'sound')
-rw-r--r--sound/song_table.inc2
-rw-r--r--sound/songs/midi/se_rg_excellent.midbin0 -> 436 bytes
-rw-r--r--sound/songs/se_rg_excellent.s155
3 files changed, 1 insertions, 156 deletions
diff --git a/sound/song_table.inc b/sound/song_table.inc
index fe714bf8c..9b4564e22 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -262,7 +262,7 @@ gSongTable:: @ 86B49F0
song se_rg_help_cl, 1, 1 @ Help Menu Close (FRLG)
song se_rg_help_ng, 1, 1 @ Help Menu Error (FRLG)
song se_rg_deomov, 1, 1 @ Deoxys Moves
- song se_rg_excellent, 1, 1
+ song se_rg_excellent, 1, 1 @ HP Restored (FRLG)
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
diff --git a/sound/songs/midi/se_rg_excellent.mid b/sound/songs/midi/se_rg_excellent.mid
new file mode 100644
index 000000000..8f7c267c4
--- /dev/null
+++ b/sound/songs/midi/se_rg_excellent.mid
Binary files differ
diff --git a/sound/songs/se_rg_excellent.s b/sound/songs/se_rg_excellent.s
deleted file mode 100644
index 63c0eae19..000000000
--- a/sound/songs/se_rg_excellent.s
+++ /dev/null
@@ -1,155 +0,0 @@
- .include "MPlayDef.s"
-
- .equ se_rg_excellent_grp, voicegroup128
- .equ se_rg_excellent_pri, 5
- .equ se_rg_excellent_rev, reverb_set+50
- .equ se_rg_excellent_mvl, 127
- .equ se_rg_excellent_key, 0
- .equ se_rg_excellent_tbs, 1
- .equ se_rg_excellent_exg, 0
- .equ se_rg_excellent_cmp, 1
-
- .section .rodata
- .global se_rg_excellent
- .align 2
-
-@********************** Track 1 **********************@
-
-se_rg_excellent_1:
- .byte KEYSH , se_rg_excellent_key+0
- .byte TEMPO , 150*se_rg_excellent_tbs/2
- .byte VOICE , 46
- .byte VOL , 110*se_rg_excellent_mvl/mxv
- .byte BENDR , 2
- .byte PAN , c_v+0
- .byte BEND , c_v+15
- .byte W01
- .byte N02 , Dn6 , v112
- .byte W02
- .byte Cs6
- .byte W03
- .byte PAN , c_v+8
- .byte N02 , An5
- .byte W02
- .byte Fs5
- .byte W01
- .byte W01
- .byte Dn5
- .byte W02
- .byte PAN , c_v-7
- .byte W01
- .byte N02 , Dn5 , v104
- .byte W02
- .byte Cs5 , v100
- .byte W03
- .byte PAN , c_v+0
- .byte N02 , An4 , v096
- .byte W02
- .byte Fs4 , v092
- .byte W01
- .byte W01
- .byte Dn4 , v088
- .byte W02
- .byte PAN , c_v+15
- .byte W01
- .byte N02 , Dn6
- .byte W02
- .byte Cs6 , v084
- .byte W03
- .byte An5 , v080
- .byte W02
- .byte Fs5 , v076
- .byte W01
- .byte W01
- .byte Dn5 , v072
- .byte W02
- .byte PAN , c_v-16
- .byte W01
- .byte N02 , Dn6 , v068
- .byte W02
- .byte Cs6 , v064
- .byte W03
- .byte An5 , v060
- .byte W02
- .byte Fs5 , v056
- .byte W01
- .byte W01
- .byte Dn5 , v052
- .byte W02
- .byte W03
- .byte FINE
-
-@********************** Track 2 **********************@
-
-se_rg_excellent_2:
- .byte KEYSH , se_rg_excellent_key+0
- .byte VOICE , 53
- .byte BENDR , 2
- .byte VOL , 43*se_rg_excellent_mvl/mxv
- .byte BEND , c_v+15
- .byte N02 , An6 , v112
- .byte W02
- .byte Fs6
- .byte W01
- .byte W01
- .byte Dn6
- .byte W02
- .byte W01
- .byte Cs6
- .byte W02
- .byte An5
- .byte W03
- .byte N02
- .byte W02
- .byte Fs5 , v104
- .byte W01
- .byte W01
- .byte Dn5 , v100
- .byte W02
- .byte W01
- .byte Cs5 , v096
- .byte W02
- .byte An4 , v092
- .byte W03
- .byte An6 , v088
- .byte W02
- .byte Fs6 , v084
- .byte W01
- .byte W01
- .byte Dn6 , v080
- .byte W02
- .byte W01
- .byte Cs6 , v076
- .byte W02
- .byte An5 , v072
- .byte W03
- .byte An6 , v068
- .byte W02
- .byte Fs6 , v064
- .byte W01
- .byte W01
- .byte Dn6 , v060
- .byte W02
- .byte W01
- .byte Cs6 , v056
- .byte W02
- .byte An5 , v052
- .byte W03
- .byte W03
- .byte FINE
-
-@******************************************************@
- .align 2
-
-se_rg_excellent:
- .byte 2 @ NumTrks
- .byte 0 @ NumBlks
- .byte se_rg_excellent_pri @ Priority
- .byte se_rg_excellent_rev @ Reverb.
-
- .word se_rg_excellent_grp
-
- .word se_rg_excellent_1
- .word se_rg_excellent_2
-
- .end