summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKermalis <29823718+Kermalis@users.noreply.github.com>2018-09-28 19:31:55 -0400
committerKermalis <29823718+Kermalis@users.noreply.github.com>2018-09-28 19:31:55 -0400
commit05d012b1a7d95285c80031a75f9e7ed4ae216392 (patch)
tree8eea888c6de8a49896cac93cc6d46a00ffaac88f
parent6e1118c602184dc657ef69d868ba37333b5bd2e6 (diff)
Match mus_me_b_big.mid
-rw-r--r--ld_script.txt2
-rw-r--r--songs.mk3
-rw-r--r--sound/song_table.inc2
-rw-r--r--sound/songs/midi/mus_me_b_big.midbin0 -> 1330 bytes
-rw-r--r--sound/songs/mus_me_b_big.s442
5 files changed, 5 insertions, 444 deletions
diff --git a/ld_script.txt b/ld_script.txt
index 7450ebee2..7db9b9a60 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -872,7 +872,7 @@ SECTIONS {
sound/songs/midi/mus_dan03.o(.rodata);
sound/songs/mus_me_kinomi.o(.rodata);
sound/songs/mus_me_tama.o(.rodata);
- sound/songs/mus_me_b_big.o(.rodata);
+ sound/songs/midi/mus_me_b_big.o(.rodata);
sound/songs/mus_me_b_small.o(.rodata);
sound/songs/mus_me_zannen.o(.rodata);
sound/songs/midi/mus_bd_time.o(.rodata);
diff --git a/songs.mk b/songs.mk
index aaaa4fb52..6d62f8947 100644
--- a/songs.mk
+++ b/songs.mk
@@ -252,6 +252,9 @@ $(MID_SUBDIR)/mus_machupi.s: %.s: %.mid
$(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid
$(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+$(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid
+ $(MID) $< $@ -G012 -R$(STD_REVERB) -V090 -P5
+
$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
$(MID) $< $@ -G017 -R$(STD_REVERB)
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 8be96a444..25dba40b1 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -393,7 +393,7 @@ gSongTable:: @ 86B49F0
song mus_dan03, 0, 0 @ Cave of Origin
song mus_me_kinomi, 2, 2 @ Obtained a Berry!
song mus_me_tama, 2, 2 @ Awakening the Super-Ancient Pokémon
- song mus_me_b_big, 2, 2 @ Slots Jackpot!
+ song mus_me_b_big, 2, 2 @ Jackpot
song mus_me_b_small, 2, 2 @ Slots Victory!
song mus_me_zannen, 2, 2 @ Too bad!
song mus_bd_time, 0, 0 @ Reel Time
diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_me_b_big.mid
new file mode 100644
index 000000000..eda461fd3
--- /dev/null
+++ b/sound/songs/midi/mus_me_b_big.mid
Binary files differ
diff --git a/sound/songs/mus_me_b_big.s b/sound/songs/mus_me_b_big.s
deleted file mode 100644
index 30eca8ce1..000000000
--- a/sound/songs/mus_me_b_big.s
+++ /dev/null
@@ -1,442 +0,0 @@
- .include "MPlayDef.s"
-
- .equ mus_me_b_big_grp, voicegroup012
- .equ mus_me_b_big_pri, 5
- .equ mus_me_b_big_rev, reverb_set+50
- .equ mus_me_b_big_mvl, 127
- .equ mus_me_b_big_key, 0
- .equ mus_me_b_big_tbs, 1
- .equ mus_me_b_big_exg, 0
- .equ mus_me_b_big_cmp, 1
-
- .section .rodata
- .global mus_me_b_big
- .align 2
-
-@********************** Track 1 **********************@
-
-mus_me_b_big_1:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte VOICE , 48
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte PAN , c_v+0
- .byte N08 , Gn3 , v040
- .byte W08
- .byte Bn3 , v052
- .byte W08
- .byte Dn4 , v060
- .byte W08
- .byte TEMPO , 144*mus_me_b_big_tbs/2
- .byte VOICE , 56
- .byte N04 , Gn3 , v116
- .byte W08
- .byte Bn3
- .byte W08
- .byte Gn3
- .byte W08
- .byte N44 , Dn4
- .byte W24
- .byte MOD , 6
- .byte W04
- .byte VOL , 88*mus_me_b_big_mvl/mxv
- .byte W04
- .byte 81*mus_me_b_big_mvl/mxv
- .byte W04
- .byte 68*mus_me_b_big_mvl/mxv
- .byte W04
- .byte 49*mus_me_b_big_mvl/mxv
- .byte W04
- .byte MOD , 0
- .byte W04
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte N05 , Bn3
- .byte W08
- .byte Dn4
- .byte W08
- .byte Gn4
- .byte W08
- .byte N04 , En4
- .byte W08
- .byte Cn5
- .byte W08
- .byte Gn4
- .byte W08
- .byte N48 , Bn4
- .byte W03
- .byte VOL , 82*mus_me_b_big_mvl/mxv
- .byte W03
- .byte 79*mus_me_b_big_mvl/mxv
- .byte W03
- .byte 68*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 72*mus_me_b_big_mvl/mxv
- .byte W01
- .byte MOD , 6
- .byte W05
- .byte VOL , 76*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 82*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 85*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 90*mus_me_b_big_mvl/mxv
- .byte W09
- .byte MOD , 0
- .byte N12
- .byte W48
- .byte FINE
-
-@********************** Track 2 **********************@
-
-mus_me_b_big_2:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte VOICE , 48
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte PAN , c_v+10
- .byte W04
- .byte N08 , An3 , v044
- .byte W08
- .byte Cn4 , v056
- .byte W08
- .byte N04 , Fs4 , v064
- .byte W04
- .byte N08 , Gn4 , v060
- .byte W08
- .byte Bn4
- .byte W08
- .byte Gn4
- .byte W08
- .byte W24
- .byte N08
- .byte W08
- .byte Bn4
- .byte W08
- .byte Gn4
- .byte W08
- .byte Dn4
- .byte W08
- .byte Gn4
- .byte W08
- .byte Bn4
- .byte W08
- .byte Cn5
- .byte W08
- .byte Gn5
- .byte W08
- .byte En5
- .byte W08
- .byte N48 , Gn5
- .byte W03
- .byte VOL , 82*mus_me_b_big_mvl/mxv
- .byte W03
- .byte 79*mus_me_b_big_mvl/mxv
- .byte W03
- .byte 68*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 72*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 76*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 82*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 85*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 90*mus_me_b_big_mvl/mxv
- .byte W09
- .byte N12
- .byte W48
- .byte FINE
-
-@********************** Track 3 **********************@
-
-mus_me_b_big_3:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte W24
- .byte VOICE , 47
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte PAN , c_v+0
- .byte N08 , Gn2 , v127
- .byte W08
- .byte N16 , Bn1
- .byte W16
- .byte N24 , Dn2
- .byte W40
- .byte N08 , Gn2
- .byte W08
- .byte N24 , Dn2
- .byte W24
- .byte N04 , Cn2
- .byte W04
- .byte N04
- .byte W04
- .byte N08
- .byte W08
- .byte N08
- .byte W08
- .byte N04 , Gn2
- .byte W04
- .byte Dn2 , v092
- .byte W04
- .byte Dn2 , v096
- .byte W04
- .byte N04
- .byte W04
- .byte Dn2 , v100
- .byte W04
- .byte Dn2 , v104
- .byte W04
- .byte Dn2 , v108
- .byte W04
- .byte Dn2 , v112
- .byte W04
- .byte Dn2 , v116
- .byte W04
- .byte N04
- .byte W04
- .byte Dn2 , v120
- .byte W04
- .byte Dn2 , v124
- .byte W04
- .byte N24 , Gn2 , v127
- .byte W48
- .byte FINE
-
-@********************** Track 4 **********************@
-
-mus_me_b_big_4:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte XCMD , xIECV , 10
- .byte xIECL , 8
- .byte W24
- .byte VOICE , 82
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte PAN , c_v-48
- .byte N04 , Dn3 , v052
- .byte W08
- .byte Gn3
- .byte W08
- .byte Dn3
- .byte W08
- .byte N68 , Bn3
- .byte W24
- .byte MOD , 6
- .byte W04
- .byte VOL , 87*mus_me_b_big_mvl/mxv
- .byte W08
- .byte 75*mus_me_b_big_mvl/mxv
- .byte W09
- .byte 64*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 54*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 43*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 27*mus_me_b_big_mvl/mxv
- .byte W03
- .byte 9*mus_me_b_big_mvl/mxv
- .byte W02
- .byte MOD , 0
- .byte W04
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte N04 , Gn3
- .byte W08
- .byte En4
- .byte W08
- .byte Cn4
- .byte W08
- .byte N48 , Dn4
- .byte W16
- .byte MOD , 6
- .byte W32
- .byte 0
- .byte N12
- .byte W48
- .byte FINE
-
-@********************** Track 5 **********************@
-
-mus_me_b_big_5:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte XCMD , xIECV , 10
- .byte W24
- .byte VOICE , 83
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte PAN , c_v+47
- .byte BEND , c_v+0
- .byte N04 , Bn2 , v052
- .byte W08
- .byte Dn3
- .byte W08
- .byte Bn2
- .byte W08
- .byte N68 , Gn3
- .byte W24
- .byte MOD , 6
- .byte W04
- .byte VOL , 87*mus_me_b_big_mvl/mxv
- .byte W08
- .byte 75*mus_me_b_big_mvl/mxv
- .byte W09
- .byte 64*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 54*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 43*mus_me_b_big_mvl/mxv
- .byte W06
- .byte 27*mus_me_b_big_mvl/mxv
- .byte W03
- .byte 9*mus_me_b_big_mvl/mxv
- .byte W02
- .byte MOD , 0
- .byte W04
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte N04 , En3
- .byte W08
- .byte Cn4
- .byte W08
- .byte Gn3
- .byte W08
- .byte N48 , Bn3
- .byte W16
- .byte MOD , 6
- .byte W32
- .byte 0
- .byte N12
- .byte W48
- .byte FINE
-
-@********************** Track 6 **********************@
-
-mus_me_b_big_6:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte W24
- .byte VOICE , 88
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte W24
- .byte N24 , Gn1 , v080
- .byte W32
- .byte N04
- .byte W08
- .byte N04
- .byte W08
- .byte N16
- .byte W16
- .byte Bn1
- .byte W16
- .byte Cn2
- .byte W16
- .byte Bn1
- .byte W16
- .byte An1
- .byte W16
- .byte N08 , Gn1
- .byte W08
- .byte N04 , Dn1
- .byte W04
- .byte Fs1
- .byte W04
- .byte N12 , Gn1
- .byte W48
- .byte FINE
-
-@********************** Track 7 **********************@
-
-mus_me_b_big_7:
- .byte KEYSH , mus_me_b_big_key+0
- .byte W12
- .byte W24
- .byte VOICE , 0
- .byte VOL , 90*mus_me_b_big_mvl/mxv
- .byte N04 , En1 , v112
- .byte W04
- .byte En1 , v076
- .byte W04
- .byte N04
- .byte W04
- .byte En1 , v080
- .byte W04
- .byte En1 , v084
- .byte W04
- .byte En1 , v088
- .byte W04
- .byte En1 , v112
- .byte N72 , Bn2 , v092
- .byte W16
- .byte N04 , En1 , v112
- .byte W08
- .byte N04
- .byte W04
- .byte En1 , v068
- .byte W04
- .byte En1 , v088
- .byte W04
- .byte En1 , v108
- .byte W04
- .byte En1 , v112
- .byte W08
- .byte N04
- .byte W16
- .byte N04
- .byte W08
- .byte En1 , v120
- .byte W16
- .byte En1 , v092
- .byte W04
- .byte N04
- .byte W04
- .byte En1 , v112
- .byte N48 , Bn2 , v092
- .byte W04
- .byte N04 , En1 , v076
- .byte W04
- .byte N04
- .byte W04
- .byte En1 , v080
- .byte W04
- .byte En1 , v084
- .byte W04
- .byte En1 , v088
- .byte W04
- .byte En1 , v092
- .byte W04
- .byte N04
- .byte W04
- .byte En1 , v096
- .byte W04
- .byte En1 , v100
- .byte W04
- .byte En1 , v104
- .byte W04
- .byte En1 , v108
- .byte W04
- .byte En1 , v120
- .byte N24 , Bn2 , v092
- .byte W48
- .byte FINE
-
-@******************************************************@
- .align 2
-
-mus_me_b_big:
- .byte 7 @ NumTrks
- .byte 0 @ NumBlks
- .byte mus_me_b_big_pri @ Priority
- .byte mus_me_b_big_rev @ Reverb.
-
- .word mus_me_b_big_grp
-
- .word mus_me_b_big_1
- .word mus_me_b_big_2
- .word mus_me_b_big_3
- .word mus_me_b_big_4
- .word mus_me_b_big_5
- .word mus_me_b_big_6
- .word mus_me_b_big_7
-
- .end