From 8edfcc4b1e36111d400b5f104a04001c66416426 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sat, 12 Oct 2013 14:40:37 -0400 Subject: All music and sfx --- music/meetrival.asm | 395 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 395 insertions(+) create mode 100644 music/meetrival.asm (limited to 'music/meetrival.asm') diff --git a/music/meetrival.asm b/music/meetrival.asm new file mode 100644 index 00000000..75d38a29 --- /dev/null +++ b/music/meetrival.asm @@ -0,0 +1,395 @@ +Music_MeetRival_branch_b119: + tempo 0, 100 + loopchannel 0, Music_MeetRival_branch_b123 + +Music_MeetRival_Ch1: ; b120 (2:7120) + tempo 0, 112 + +Music_MeetRival_branch_b123: + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 3 + octave 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 + rest 3 + note D_, 1 + rest 5 + note A_, 2 + note G_, 2 + note A_, 2 + +Music_MeetRival_branch_b140: + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 + octave 4 + note C_, 4 + note D_, 2 + rest 4 + note D_, 4 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 + octave 3 + note B_, 4 + octave 4 + note C_, 2 + rest 4 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + rest 2 + octave 3 + note D_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 2 + note F_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + rest 4 + note A#, 4 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + notetype 12, 11, 7 + octave 3 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 + rest 4 + note D_, 4 + notetype 12, 11, 3 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_MeetRival_branch_b140 + +Music_MeetRival_branch_b19b: + tempo 0, 100 + loopchannel 0, Music_MeetRival_branch_b1a5 + tempo 0, 112 + +Music_MeetRival_branch_b1a5: + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 3 + octave 3 + note D_, 1 + rest 3 + note D_, 1 + rest 5 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_MeetRival_branch_b140 + + +Music_MeetRival_Ch2: ; b1bb (2:71bb) + duty 3 + vibrato 10, 2, 6 + notetype 12, 12, 7 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 6 + octave 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note D_, 1 + rest 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + +Music_MeetRival_branch_b1d8: + notetype 12, 12, 7 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 + rest 4 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 + octave 5 + note C_, 4 + octave 4 + note G_, 2 + note A#, 6 + note B_, 4 + octave 5 + note C_, 2 + rest 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + notetype 12, 11, 0 + note D_, 16 + notetype 12, 11, 5 + note D_, 6 + notetype 12, 12, 7 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + notetype 12, 11, 0 + note C_, 8 + notetype 12, 12, 7 + note C_, 8 + octave 4 + note C_, 2 + rest 4 + note A#, 4 + note G_, 2 + note F_, 2 + notetype 12, 11, 0 + note G_, 16 + notetype 12, 11, 3 + note G_, 2 + octave 3 + note G_, 2 + rest 4 + note G_, 4 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + loopchannel 0, Music_MeetRival_branch_b1d8 + +Music_MeetRival_branch_b21d: + duty 3 + vibrato 10, 2, 6 + notetype 12, 12, 7 + octave 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note D_, 1 + rest 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + loopchannel 0, Music_MeetRival_branch_b1d8 + + +Music_MeetRival_Ch3: ; b233 (2:7233) + notetype 12, 1, 4 + octave 5 + note D_, 2 + rest 2 + note C#, 2 + rest 2 + note C_, 2 + rest 2 + octave 4 + note B_, 2 + rest 2 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + +Music_MeetRival_branch_b24b: + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 4 + octave 5 + note D_, 4 + octave 4 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + rest 2 + note B_, 2 + octave 5 + note C_, 2 + rest 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + rest 2 + note F#, 2 + note A_, 2 + note F#, 2 + rest 2 + note A_, 2 + note F#, 2 + note A_, 2 + rest 2 + note F#, 2 + note A_, 2 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note A_, 2 + note E_, 2 + octave 5 + note C_, 2 + rest 2 + octave 4 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 + rest 4 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 + rest 2 + note G_, 2 + note A#, 2 + note G_, 2 + rest 2 + note A#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + loopchannel 0, Music_MeetRival_branch_b24b + +Music_MeetRival_branch_b2b5: + notetype 12, 1, 4 + octave 4 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + loopchannel 0, Music_MeetRival_branch_b24b +; 0xb2c8 \ No newline at end of file -- cgit v1.3.1-sl0p From 7df715d0c465ff24a5c5175957c08f6522601e50 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 14 Oct 2013 00:41:56 -0400 Subject: Add song alternate start labels --- main.asm | 12 ++++++------ music/meetrival.asm | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'music/meetrival.asm') diff --git a/main.asm b/main.asm index 07230475..19331779 100644 --- a/main.asm +++ b/main.asm @@ -20133,11 +20133,11 @@ Func_9b47: ; 0x9b47 ld a, $de call PlayMusic ld hl, $c006 - ld de, $71a2 + ld de, Music_MeetRival_branch_b1a2 call Func_9b60 - ld de, $721d + ld de, Music_MeetRival_branch_b21d call Func_9b60 - ld de, $72b5 + ld de, Music_MeetRival_branch_b2b5 Func_9b60: ; 0x9b60 ld a, e @@ -20152,14 +20152,14 @@ Func_9b65: ; 0x9b65 ld a, $de call PlayMusic ld hl, $c006 - ld de, $7119 + ld de, Music_MeetRival_branch_b119 jp Func_9b60 ; 0x9b75 Func_9b75: ; 0x9b75 call Func_9b47 ld hl, $c006 - ld de, $719b + ld de, Music_MeetRival_branch_b19b jp Func_9b60 ; 0x9b81 @@ -20175,7 +20175,7 @@ Func_9b81: ; 0x9b81 ld a, $c3 call PlayMusic ld hl, $c006 - ld de, $6a6f + ld de, Music_Cities1_branch_aa6f jp Func_9b60 ; 0x9ba3 diff --git a/music/meetrival.asm b/music/meetrival.asm index 75d38a29..13836b2c 100644 --- a/music/meetrival.asm +++ b/music/meetrival.asm @@ -122,6 +122,8 @@ Music_MeetRival_branch_b140: Music_MeetRival_branch_b19b: tempo 0, 100 loopchannel 0, Music_MeetRival_branch_b1a5 + +Music_MeetRival_branch_b1a2: tempo 0, 112 Music_MeetRival_branch_b1a5: -- cgit v1.3.1-sl0p