diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-04-19 12:01:24 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-04-19 12:21:29 -0400 |
| commit | 67ccd2f483fa8e759726733b20d488fd00e7b653 (patch) | |
| tree | 587037b015fb12077107956f52a9eef7114f8099 | |
| parent | 952e18cf1d2c4ebb452e8e18528ed5e35463fdbc (diff) | |
Better music command names
| -rwxr-xr-x | engine/music1.asm | 106 | ||||
| -rwxr-xr-x | engine/music2.asm | 110 | ||||
| -rwxr-xr-x | macros.asm | 44 | ||||
| -rw-r--r-- | music/battletheme1.asm | 1268 | ||||
| -rw-r--r-- | music/battletheme2.asm | 798 | ||||
| -rw-r--r-- | music/battletheme3.asm | 1104 | ||||
| -rw-r--r-- | music/boosterpack.asm | 110 | ||||
| -rw-r--r-- | music/cardpop.asm | 214 | ||||
| -rw-r--r-- | music/challengehall.asm | 954 | ||||
| -rw-r--r-- | music/club1.asm | 692 | ||||
| -rw-r--r-- | music/club2.asm | 264 | ||||
| -rw-r--r-- | music/club3.asm | 920 | ||||
| -rw-r--r-- | music/credits.asm | 1876 | ||||
| -rw-r--r-- | music/darkdiddly.asm | 70 | ||||
| -rw-r--r-- | music/deckmachine.asm | 152 | ||||
| -rw-r--r-- | music/hallofhonor.asm | 274 | ||||
| -rw-r--r-- | music/imakuni.asm | 326 | ||||
| -rw-r--r-- | music/matchloss.asm | 126 | ||||
| -rw-r--r-- | music/matchstart1.asm | 54 | ||||
| -rw-r--r-- | music/matchstart2.asm | 100 | ||||
| -rw-r--r-- | music/matchstart3.asm | 198 | ||||
| -rw-r--r-- | music/matchvictory.asm | 134 | ||||
| -rw-r--r-- | music/medal.asm | 130 | ||||
| -rw-r--r-- | music/overworld.asm | 1002 | ||||
| -rw-r--r-- | music/pausemenu.asm | 560 | ||||
| -rw-r--r-- | music/pcmainmenu.asm | 284 | ||||
| -rw-r--r-- | music/pokemondome.asm | 536 | ||||
| -rw-r--r-- | music/ronald.asm | 614 | ||||
| -rw-r--r-- | music/titlescreen.asm | 282 |
29 files changed, 6652 insertions, 6650 deletions
diff --git a/engine/music1.asm b/engine/music1.asm index e6ab00a..a6707b7 100755 --- a/engine/music1.asm +++ b/engine/music1.asm @@ -580,7 +580,7 @@ Music1_PlayNextNote: ; f4414 (3d:4414) push hl push af cp $d0 - jr c, Music1_Note + jr c, Music1_note sub $d0 add a ld e, a @@ -596,56 +596,56 @@ Music1_PlayNextNote: ; f4414 (3d:4414) jp [hl] Music1_CommandTable: ; f442c (3d:442c) - dw Music1_Speed - dw Music1_musicdx - dw Music1_musicdx - dw Music1_musicdx - dw Music1_musicdx - dw Music1_musicdx - dw Music1_musicdx - dw Music1_musicd7 - dw Music1_musicd8 - dw Music1_musicd9 - dw Music1_End - dw Music1_End + dw Music1_speed + dw Music1_octave + dw Music1_octave + dw Music1_octave + dw Music1_octave + dw Music1_octave + dw Music1_octave + dw Music1_inc_octave + dw Music1_dec_octave + dw Music1_no_fade + dw Music1_end + dw Music1_end dw Music1_musicdc dw Music1_MainLoop - dw Music1_EndMainLoop + dw Music1_endMainLoop dw Music1_Loop - dw Music1_EndLoop + dw Music1_endLoop dw Music1_jp dw Music1_call dw Music1_ret dw Music1_musice4 - dw Music1_musice5 - dw Music1_musice6 - dw Music1_musice7 + dw Music1_duty + dw Music1_volume + dw Music1_duty3 dw Music1_musice8 dw Music1_musice9 - dw Music1_musicea - dw Music1_musiceb + dw Music1_vibrato_rate + dw Music1_vibrato_delay dw Music1_musicec dw Music1_musiced - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - dw Music1_End - -Music1_Note: ; f448c (3d:448c) + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + dw Music1_end + +Music1_note: ; f448c (3d:448c) push af ld a, [hl] ld e, a @@ -839,7 +839,7 @@ Music1_Note: ; f448c (3d:448c) ld [hl], d ret -Music1_Speed: ; f4598 (3d:4598) +Music1_speed: ; f4598 (3d:4598) pop hl ld a, [hli] push hl @@ -848,7 +848,7 @@ Music1_Speed: ; f4598 (3d:4598) ld [hl], a jp Music1_PlayNextNote_pop -Music1_musicdx: ; f45a3 (3d:45a3) +Music1_octave: ; f45a3 (3d:45a3) and $7 dec a ld hl, $ddaf @@ -866,19 +866,19 @@ Music1_musicdx: ; f45a3 (3d:45a3) ld [hl], a jp Music1_PlayNextNote_pop -Music1_musicd7: ; f45bb (3d:45bb) +Music1_inc_octave: ; f45bb (3d:45bb) ld hl, $ddaf add hl, bc inc [hl] jp Music1_PlayNextNote_pop -Music1_musicd8: ; f45c3 (3d:45c3) +Music1_dec_octave: ; f45c3 (3d:45c3) ld hl, $ddaf add hl, bc dec [hl] jp Music1_PlayNextNote_pop -Music1_musicd9: ; f45cb (3d:45cb) +Music1_no_fade: ; f45cb (3d:45cb) ld hl, $dd91 add hl, bc ld [hl], $80 @@ -919,7 +919,7 @@ Music1_MainLoop: ; f45ef (3d:45ef) ld [hl], d jp Music1_PlayNextNote_pop -Music1_EndMainLoop: ; f45fd (3d:45fd) +Music1_endMainLoop: ; f45fd (3d:45fd) pop hl ld hl, $dd9d add hl, bc @@ -946,7 +946,7 @@ Music1_Loop: ; f4609 (3d:4609) call Music1_SetReturnAddress jp Music1_PlayNextNote_pop -Music1_EndLoop: ; f461e (3d:461e) +Music1_endLoop: ; f461e (3d:461e) call Music1_GetReturnAddress dec hl ld a, [hl] @@ -1015,7 +1015,7 @@ Music1_musice4: ; f4667 (3d:4667) ld l, e jp Music1_PlayNextNote -Music1_musice5: ; f4674 (3d:4674) +Music1_duty: ; f4674 (3d:4674) pop de ld a, [de] and $c0 @@ -1027,7 +1027,7 @@ Music1_musice5: ; f4674 (3d:4674) ld l, e jp Music1_PlayNextNote -Music1_musice6: ; f4683 (3d:4683) +Music1_volume: ; f4683 (3d:4683) pop de ld a, [de] inc de @@ -1038,7 +1038,7 @@ Music1_musice6: ; f4683 (3d:4683) ld l, e jp Music1_PlayNextNote -Music1_musice7: ; f4690 (3d:4690) +Music1_duty3: ; f4690 (3d:4690) pop de ld a, [de] inc de @@ -1071,7 +1071,7 @@ Music1_musice9: ; f46ad (3d:46ad) ld l, e jp Music1_PlayNextNote -Music1_musicea: ; f46ba (3d:46ba) +Music1_vibrato_rate: ; f46ba (3d:46ba) pop de ld a, [de] inc de @@ -1085,7 +1085,7 @@ Music1_musicea: ; f46ba (3d:46ba) ld l, e jp Music1_PlayNextNote -Music1_musiceb: ; f46cc (3d:46cc) +Music1_vibrato_delay: ; f46cc (3d:46cc) pop de ld a, [de] inc de @@ -1119,7 +1119,7 @@ Music1_musiced: ; f46e6 (3d:46e6) ld l, e jp Music1_PlayNextNote -Music1_End: ; f46f4 (3d:46f4) +Music1_end: ; f46f4 (3d:46f4) ld hl, $dd8d add hl, bc ld [hl], $0 diff --git a/engine/music2.asm b/engine/music2.asm index 4fe13e9..0ba56e7 100755 --- a/engine/music2.asm +++ b/engine/music2.asm @@ -252,7 +252,7 @@ Music2_PlaySong: ; f818c (3e:418c) push af ld c, a ld b, $0 - ld hl, SongBanks1 + ld hl, SongBanks2 add hl, bc ld a, [hl] ld [$dd81], a @@ -262,7 +262,7 @@ Music2_PlaySong: ; f818c (3e:418c) add a ld c, a ld b, $0 - ld hl, SongHeaderPointers1 + ld hl, SongHeaderPointers2 add hl, bc ld e, [hl] inc hl @@ -580,7 +580,7 @@ Music2_PlayNextNote: ; f8414 (3e:4414) push hl push af cp $d0 - jr c, Music2_Note + jr c, Music2_note sub $d0 add a ld e, a @@ -596,56 +596,56 @@ Music2_PlayNextNote: ; f8414 (3e:4414) jp [hl] Music2_CommandTable: ; f842c (3e:442c) - dw Music2_Speed - dw Music2_musicdx - dw Music2_musicdx - dw Music2_musicdx - dw Music2_musicdx - dw Music2_musicdx - dw Music2_musicdx - dw Music2_musicd7 - dw Music2_musicd8 - dw Music2_musicd9 - dw Music2_End - dw Music2_End + dw Music2_speed + dw Music2_octave + dw Music2_octave + dw Music2_octave + dw Music2_octave + dw Music2_octave + dw Music2_octave + dw Music2_inc_octave + dw Music2_dec_octave + dw Music2_no_fade + dw Music2_end + dw Music2_end dw Music2_musicdc dw Music2_MainLoop - dw Music2_EndMainLoop + dw Music2_endMainLoop dw Music2_Loop - dw Music2_EndLoop + dw Music2_endLoop dw Music2_jp dw Music2_call dw Music2_ret dw Music2_musice4 - dw Music2_musice5 - dw Music2_musice6 - dw Music2_musice7 + dw Music2_duty + dw Music2_volume + dw Music2_duty3 dw Music2_musice8 dw Music2_musice9 - dw Music2_musicea - dw Music2_musiceb + dw Music2_vibrato_rate + dw Music2_vibrato_delay dw Music2_musicec dw Music2_musiced - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - dw Music2_End - -Music2_Note: ; f448c (3d:448c) + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + dw Music2_end + +Music2_note: ; f448c (3d:448c) push af ld a, [hl] ld e, a @@ -839,7 +839,7 @@ Music2_Note: ; f448c (3d:448c) ld [hl], d ret -Music2_Speed: ; f8598 (3e:4598) +Music2_speed: ; f8598 (3e:4598) pop hl ld a, [hli] push hl @@ -848,7 +848,7 @@ Music2_Speed: ; f8598 (3e:4598) ld [hl], a jp Music2_PlayNextNote_pop -Music2_musicdx: ; f85a3 (3e:45a3) +Music2_octave: ; f85a3 (3e:45a3) and $7 dec a ld hl, $ddaf @@ -866,19 +866,19 @@ Music2_musicdx: ; f85a3 (3e:45a3) ld [hl], a jp Music2_PlayNextNote_pop -Music2_musicd7: ; f85bb (3e:45bb) +Music2_inc_octave: ; f85bb (3e:45bb) ld hl, $ddaf add hl, bc inc [hl] jp Music2_PlayNextNote_pop -Music2_musicd8: ; f85c3 (3e:45c3) +Music2_dec_octave: ; f85c3 (3e:45c3) ld hl, $ddaf add hl, bc dec [hl] jp Music2_PlayNextNote_pop -Music2_musicd9: ; f85cb (3e:45cb) +Music2_no_fade: ; f85cb (3e:45cb) ld hl, $dd91 add hl, bc ld [hl], $80 @@ -919,7 +919,7 @@ Music2_MainLoop: ; f85ef (3e:45ef) ld [hl], d jp Music2_PlayNextNote_pop -Music2_EndMainLoop: ; f85fd (3e:45fd) +Music2_endMainLoop: ; f85fd (3e:45fd) pop hl ld hl, $dd9d add hl, bc @@ -946,7 +946,7 @@ Music2_Loop: ; f8609 (3e:4609) call Music2_SetReturnAddress jp Music2_PlayNextNote_pop -Music2_EndLoop: ; f861e (3e:461e) +Music2_endLoop: ; f861e (3e:461e) call Music2_GetReturnAddress dec hl ld a, [hl] @@ -1015,7 +1015,7 @@ Music2_musice4: ; f8667 (3e:4667) ld l, e jp Music2_PlayNextNote -Music2_musice5: ; f8674 (3e:4674) +Music2_duty: ; f8674 (3e:4674) pop de ld a, [de] and $c0 @@ -1027,7 +1027,7 @@ Music2_musice5: ; f8674 (3e:4674) ld l, e jp Music2_PlayNextNote -Music2_musice6: ; f8683 (3e:4683) +Music2_volume: ; f8683 (3e:4683) pop de ld a, [de] inc de @@ -1038,7 +1038,7 @@ Music2_musice6: ; f8683 (3e:4683) ld l, e jp Music2_PlayNextNote -Music2_musice7: ; f8690 (3e:4690) +Music2_duty3: ; f8690 (3e:4690) pop de ld a, [de] inc de @@ -1071,7 +1071,7 @@ Music2_musice9: ; f86ad (3e:46ad) ld l, e jp Music2_PlayNextNote -Music2_musicea: ; f86ba (3e:46ba) +Music2_vibrato_rate: ; f86ba (3e:46ba) pop de ld a, [de] inc de @@ -1085,7 +1085,7 @@ Music2_musicea: ; f86ba (3e:46ba) ld l, e jp Music2_PlayNextNote -Music2_musiceb: ; f86cc (3e:46cc) +Music2_vibrato_delay: ; f86cc (3e:46cc) pop de ld a, [de] inc de @@ -1119,7 +1119,7 @@ Music2_musiced: ; f86e6 (3e:46e6) ld l, e jp Music2_PlayNextNote -Music2_End: ; f86f4 (3e:46f4) +Music2_end: ; f86f4 (3e:46f4) ld hl, $dd8d add hl, bc ld [hl], $0 @@ -49,23 +49,23 @@ rest: MACRO db \1 - 1 ENDM -Speed: MACRO +speed: MACRO db $d0, \1 ENDM -musicdx: MACRO +octave: MACRO db ($d << 4) | \1 ENDM -musicd7: MACRO +inc_octave: MACRO db $d7 ENDM -musicd8: MACRO +dec_octave: MACRO db $d8 ENDM -musicd9: MACRO +no_fade: MACRO db $d9 ENDM @@ -90,10 +90,10 @@ EndLoop: MACRO ENDM ; unused -music_jp: MACRO - db $e1 - dw \1 -ENDM +;music_jp: MACRO +; db $e1 +; dw \1 +;ENDM music_call: MACRO db $e2 @@ -108,15 +108,15 @@ musice4: MACRO db $e4, \1 ENDM -musice5: MACRO - db $e5, \1 +duty: MACRO + db $e5, \1 << 6 ENDM -musice6: MACRO +volume: MACRO db $e6, \1 ENDM -musice7: MACRO +duty3: MACRO db $e7, \1 ENDM @@ -128,21 +128,23 @@ musice9: MACRO db $e9, \1 ENDM -musicea: MACRO +vibrato_rate: MACRO db $ea, \1 ENDM -musiceb: MACRO +vibrato_delay: MACRO db $eb, \1 ENDM -musicec: MACRO - db $ec, \1 -ENDM +; unused +;musicec: MACRO +; db $ec, \1 +;ENDM -musiced: MACRO - db $ed, \1 -ENDM +; unused +;musiced: MACRO +; db $ed, \1 +;ENDM music_end: MACRO db $ff diff --git a/music/battletheme1.asm b/music/battletheme1.asm index 382c36c..338dc3c 100644 --- a/music/battletheme1.asm +++ b/music/battletheme1.asm @@ -1,12 +1,12 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) - Speed 7 + speed 7 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 8 - musice5 128 + duty 2 MainLoop - musicdx 2 + octave 2 Loop 7 rest 16 EndLoop @@ -14,129 +14,129 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) Loop 2 rest 3 music_call Branch_f54f9 - musice6 160 - Speed 1 + volume 160 + speed 1 note F_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 1 - musice6 55 + volume 55 note F#, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 1 rest 2 - musicd7 - musice6 160 + inc_octave + volume 160 note D_, 10 - musice6 55 + volume 55 note D_, 12 music_call Branch_f54f9 - musice6 160 + volume 160 note F#, 2 - musice6 55 + volume 55 note F#, 1 - musice6 160 + volume 160 note A_, 13 - musice6 55 + volume 55 note A_, 10 - musice6 160 + volume 160 note F#, 1 - musice6 55 + volume 55 note F#, 1 - musice6 160 + volume 160 note F#, 1 note G_, 1 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note A#, 4 note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 15 - musice6 55 + volume 55 note B_, 4 - musice6 160 - Speed 1 + volume 160 + speed 1 note A#, 4 note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 3 note A_, 3 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 note G_, 2 - musice6 55 + volume 55 note G_, 2 - musice6 160 - Speed 1 + volume 160 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 15 - musice6 55 + volume 55 note A_, 4 - musice6 160 - Speed 1 + volume 160 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 3 note G_, 4 note F#, 2 - musice6 55 + volume 55 note F#, 2 - musice6 160 - Speed 1 + volume 160 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 15 - musice6 55 + volume 55 note G_, 4 - musice6 160 - Speed 1 + volume 160 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 3 note F#, 4 note E_, 3 - musice6 55 + volume 55 note E_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note D#, 4 note E_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note D_, 13 - musice6 55 + volume 55 note D_, 9 - musicd8 + dec_octave EndLoop - musicd7 - musice5 64 - musice6 160 - Speed 1 + inc_octave + duty 1 + volume 160 + speed 1 note C#, 4 note D_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note D_, 1 rest 1 note D_, 1 @@ -144,50 +144,50 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) note C#, 1 rest 1 music_call Branch_f5538 - Speed 1 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 note F#, 5 - musice6 55 + volume 55 note F#, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 1 - musicd7 - Speed 1 + inc_octave + speed 1 note D_, 4 - musice6 55 + volume 55 note D_, 3 - musice6 160 + volume 160 note F#, 4 - musice6 55 + volume 55 note F#, 3 - musice6 160 + volume 160 note A_, 4 - musice6 55 + volume 55 note A_, 3 - Speed 7 + speed 7 rest 3 - musicd8 - musice5 64 - musice6 160 + dec_octave + duty 1 + volume 160 musice8 8 Loop 3 note A_, 1 rest 2 EndLoop - musicd7 - Speed 1 + inc_octave + speed 1 note C#, 4 note D_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note D_, 1 rest 1 note D_, 1 @@ -195,469 +195,469 @@ Music_BattleTheme1_Ch1: ; f532a (3d:532a) note C#, 1 rest 1 music_call Branch_f5538 - Speed 1 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 5 - musicd9 + no_fade note A_, 10 - musicd9 + no_fade note A_, 6 - musice6 55 + volume 55 note A_, 2 - musicd7 - musice6 160 - Speed 1 + inc_octave + volume 160 + speed 1 note C#, 4 note D_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note D_, 2 note C#, 1 - musice6 55 + volume 55 note C#, 2 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 1 - musice6 55 + volume 55 note B_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note A#, 4 note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 1 - musice6 55 + volume 55 note B_, 1 - musice6 160 + volume 160 note A_, 13 - musicd9 + no_fade note A_, 6 - musice6 55 + volume 55 note A_, 2 - musicd8 - musice6 121 - Speed 1 + dec_octave + volume 121 + speed 1 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 4 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 4 - musicd8 + dec_octave note C#, 5 note E_, 5 note A_, 4 - musicd7 + inc_octave note C#, 5 note E_, 5 note A_, 4 - musicd8 + dec_octave music_call Branch_f5580 - musice6 160 + volume 160 note A_, 2 - musicd9 + no_fade note A_, 8 - musicd9 + no_fade note A_, 8 - musicd9 + no_fade note A_, 6 - musice5 64 - musice6 160 - Speed 1 - musicd8 + duty 1 + volume 160 + speed 1 + dec_octave note B_, 4 - musicd7 + inc_octave note C_, 3 - Speed 7 + speed 7 note C#, 1 rest 1 note C#, 1 note D_, 2 note E_, 2 note G_, 2 - musice5 128 + duty 2 music_call Branch_f5580 - musice6 160 - Speed 1 + volume 160 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 5 note G_, 2 note F#, 2 - musice6 55 + volume 55 note F#, 2 - musice6 160 + volume 160 note E_, 2 - musice6 55 + volume 55 note E_, 2 - musice6 160 - Speed 1 + volume 160 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 5 note F#, 2 note E_, 2 - musice6 55 + volume 55 note E_, 2 - musice6 160 + volume 160 note D_, 2 - musice6 55 + volume 55 note D_, 2 - musice6 160 + volume 160 note D_, 8 - musicd9 + no_fade note D_, 8 note D_, 8 - musicd9 + no_fade note D_, 8 - musice6 55 + volume 55 note D_, 2 - musice6 160 + volume 160 note D_, 12 - musice6 55 + volume 55 note D_, 2 - musice6 160 + volume 160 note D_, 6 - musicd9 + no_fade note D_, 8 rest 4 EndMainLoop Branch_f54f9: - musicdx 2 - musice6 160 + octave 2 + volume 160 note A_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note F_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 10 - musice6 55 + volume 55 note F#, 1 - musice6 160 + volume 160 note D_, 3 - musice6 55 + volume 55 note D_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note D#, 4 note E_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note E_, 5 - musice6 55 + volume 55 note E_, 2 - musice6 160 - Speed 1 + volume 160 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 2 note F#, 1 - musice6 55 + volume 55 note F#, 2 - musice6 160 + volume 160 note E_, 1 - musice6 55 + volume 55 note E_, 1 music_ret Branch_f5538: note C_, 1 rest 2 - musicd8 + dec_octave note G_, 1 rest 2 note G_, 1 rest 2 - musice5 128 - musice6 160 + duty 2 + volume 160 note G_, 1 - musicd7 - Speed 1 + inc_octave + speed 1 note C_, 4 - musice6 55 + volume 55 note C_, 3 - musice6 160 + volume 160 note E_, 4 - musice6 55 + volume 55 note E_, 3 - musice6 160 + volume 160 note G_, 4 - musice6 55 + volume 55 note G_, 3 - Speed 7 + speed 7 rest 3 - musice5 64 - musice6 160 + duty 1 + volume 160 musice8 8 - musicd8 + dec_octave Loop 3 note G_, 1 rest 2 EndLoop - musicd7 - musice5 128 - musice6 160 - Speed 1 + inc_octave + duty 2 + volume 160 + speed 1 note A#, 4 note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 2 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 music_ret Branch_f5580: - Speed 1 - musice6 160 + speed 1 + volume 160 note F_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 9 - musice6 55 + volume 55 note F#, 2 - musice6 160 + volume 160 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 note B_, 2 - musice6 55 + volume 55 note B_, 2 - musicd7 - musice6 160 - Speed 1 + inc_octave + volume 160 + speed 1 note F_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 7 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note C#, 2 - musice6 55 + volume 55 note C#, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 9 note F#, 1 - musice6 55 + volume 55 note F#, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note A#, 4 note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 8 - musice6 55 + volume 55 note B_, 1 - musice6 160 + volume 160 note A_, 4 note G_, 4 note F#, 10 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 note D_, 10 note E_, 2 note F#, 2 - musice6 55 + volume 55 note F#, 2 music_ret Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) - Speed 7 + speed 7 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 8 MainLoop - musice5 64 - musice6 144 - musicdx 2 + duty 1 + volume 144 + octave 2 Loop 4 Loop 3 note D_, 1 rest 2 EndLoop rest 1 - musicd8 + dec_octave note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - musicd7 + inc_octave EndLoop Loop 4 - musicdx 2 + octave 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note A_, 2 music_call Branch_f59f9 EndLoop - musicdx 2 + octave 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note D_, 2 music_call Branch_f59f9 - musicdx 2 + octave 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note C_, 2 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 162 + inc_octave + duty 2 + volume 162 musice8 6 note G_, 1 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note B_, 1 rest 2 - musicd7 + inc_octave Loop 3 - musicdx 2 + octave 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note D_, 2 music_call Branch_f59f9 EndLoop - musicdx 2 + octave 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note C_, 2 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 162 + inc_octave + duty 2 + volume 162 musice8 6 note G_, 1 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note B_, 1 rest 2 - musicd7 + inc_octave note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note D_, 2 music_call Branch_f59f9 - musicdx 2 + octave 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note D_, 2 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 note D_, 1 rest 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note A_, 2 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note F#, 1 rest 1 @@ -665,23 +665,23 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) note G_, 1 rest 2 note G_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note G_, 2 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note G_, 1 rest 3 note D_, 1 rest 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note G_, 1 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note E_, 1 rest 2 @@ -689,367 +689,367 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) note F#, 1 rest 2 note F#, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 - musicd7 + inc_octave note C#, 2 music_call Branch_f5a17 - musicdx 2 + octave 2 note F#, 1 rest 2 note F#, 1 - musicd7 - musice5 128 - musice6 162 + inc_octave + duty 2 + volume 162 musice8 6 note E_, 2 music_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note G_, 2 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note E_, 1 rest 3 note E_, 1 rest 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note B_, 1 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note G_, 1 rest 2 note A_, 1 rest 2 note A_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note G_, 2 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note A_, 1 rest 3 note E_, 1 rest 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note A_, 1 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note A_, 1 rest 2 note D_, 1 rest 2 note D_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note A_, 2 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 162 + inc_octave + duty 2 + volume 162 musice8 6 note A_, 1 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note B_, 1 rest 2 - musicd7 + inc_octave note D_, 1 rest 2 note D_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note A_, 2 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 musice4 0 note E_, 1 note F#, 1 note A_, 1 rest 1 - musice6 112 + volume 112 music_call Branch_f594d - musice6 112 - musicdx 3 - Speed 1 + volume 112 + octave 3 + speed 1 note C#, 4 note D_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note D_, 1 rest 1 - musicd8 + dec_octave note F#, 1 - musice6 162 + volume 162 musice8 6 note F#, 2 - musice6 112 + volume 112 musice8 8 note A_, 10 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note D_, 1 rest 2 note D_, 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 - musicd7 + inc_octave note D_, 2 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note E_, 1 note F#, 1 note A_, 1 rest 1 music_call Branch_f594d - musice6 112 - musicdx 3 + volume 112 + octave 3 note D_, 2 rest 1 note F#, 13 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 2 note D_, 1 - musice5 128 - musicd7 - musice6 162 + duty 2 + inc_octave + volume 162 musice8 6 note D_, 2 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note D_, 1 rest 1 note D_, 1 note E_, 1 note F#, 1 rest 1 - Speed 1 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 15 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note G_, 1 rest 2 note G_, 1 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 2 rest 1 note F#, 3 rest 1 - musicd8 - musice6 162 + dec_octave + volume 162 musice8 6 note G_, 1 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note E_, 1 rest 2 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note E_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 15 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note F#, 1 rest 2 note F#, 1 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note E_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 2 rest 1 note E_, 3 rest 1 - musicd8 - musice6 162 + dec_octave + volume 162 musice8 6 note A_, 1 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note E_, 1 rest 2 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note D#, 4 note E_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note E_, 15 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note A_, 1 rest 2 note A_, 1 - musice5 128 - musice6 112 - Speed 1 + duty 2 + volume 112 + speed 1 note A#, 4 note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 2 rest 1 note A_, 3 rest 1 note G_, 3 rest 1 - Speed 1 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 1 rest 1 note F#, 13 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note D_, 1 rest 2 note D_, 1 - musicd7 - musice5 128 - musice6 162 + inc_octave + duty 2 + volume 162 musice8 6 note D_, 2 - musicd8 + dec_octave musice4 0 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note D_, 1 rest 2 music_call Branch_f59b4 - musicdx 3 - Speed 1 - musice6 112 + octave 3 + speed 1 + volume 112 note F_, 4 note F#, 3 - musicd9 - Speed 7 + no_fade + speed 7 note F#, 1 rest 1 note D_, 5 rest 1 - musicd8 + dec_octave note F#, 1 - Speed 1 + speed 1 note A_, 4 rest 3 - musicd7 + inc_octave note D_, 4 rest 3 note F#, 4 rest 3 - Speed 7 + speed 7 rest 3 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 Loop 3 note D_, 1 rest 2 EndLoop music_call Branch_f59b4 - musice6 128 - musicdx 3 + volume 128 + octave 3 note D_, 16 - musicd9 + no_fade note D_, 6 rest 2 - Speed 1 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 2 note A_, 1 rest 2 @@ -1060,49 +1060,49 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 13 note C#, 6 rest 2 - musicd8 - musice6 121 - Speed 1 + dec_octave + volume 121 + speed 1 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 4 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 4 - musicd8 - musicd8 + dec_octave + dec_octave note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 4 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 4 - musicd8 - Speed 7 + dec_octave + speed 7 music_call Branch_f598c note D_, 8 - musicd9 + no_fade note D_, 8 note C#, 6 - musicd8 - musice5 64 - musice6 112 - Speed 1 + dec_octave + duty 1 + volume 112 + speed 1 note G_, 4 note G#, 3 - Speed 7 + speed 7 note A_, 1 rest 1 note A_, 1 note B_, 2 - musicd7 + inc_octave note C#, 2 note E_, 2 - musice5 128 + duty 2 music_call Branch_f598c note D_, 4 note E_, 2 @@ -1114,14 +1114,14 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 2 note C#, 2 rest 2 - musicd8 + dec_octave note A_, 2 rest 2 note G_, 8 - musicd9 + no_fade note G_, 8 note F#, 8 - musicd9 + no_fade note F#, 8 rest 2 note G_, 12 @@ -1131,55 +1131,55 @@ Music_BattleTheme1_Ch2: ; f55e7 (3d:55e7) EndMainLoop Branch_f594d: - musicdx 3 - Speed 1 + octave 3 + speed 1 note C#, 4 note D_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note D_, 9 - musicd8 - musice5 64 - musice6 144 - musicd8 + dec_octave + duty 1 + volume 144 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note A_, 3 rest 1 - musicd7 + inc_octave note C_, 6 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note D_, 1 rest 1 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note D#, 4 note E_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note E_, 2 note D_, 1 - musicd8 - musice6 162 + dec_octave + volume 162 musice8 6 note G_, 2 - musicd7 - musice6 112 + inc_octave + volume 112 musice8 8 note C_, 1 rest 1 music_ret Branch_f598c: - musice6 128 + volume 128 note D_, 10 rest 2 note E_, 1 @@ -1188,11 +1188,11 @@ Branch_f598c: rest 1 note G_, 2 rest 2 - musicd7 + inc_octave note D_, 8 note C#, 1 rest 1 - musicd8 + dec_octave note B_, 1 rest 1 note A_, 2 @@ -1209,24 +1209,24 @@ Branch_f598c: rest 1 note F#, 1 rest 1 - musicd8 + dec_octave note B_, 10 - musicd7 + inc_octave note C#, 2 note D_, 2 rest 2 note D_, 2 - musicd9 + no_fade music_ret Branch_f59b4: - musicdx 2 - musice6 128 - Speed 1 + octave 2 + volume 128 + speed 1 note G#, 4 note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 1 rest 1 note A_, 1 @@ -1239,35 +1239,35 @@ Branch_f59b4: rest 2 note C_, 1 rest 2 - musice5 128 - musice6 112 + duty 2 + volume 112 note E_, 1 - Speed 1 + speed 1 note G_, 4 rest 3 - musicd7 + inc_octave note C_, 4 rest 3 note E_, 4 rest 3 - Speed 7 + speed 7 rest 3 musice8 8 - musicd8 - musice5 64 - musice6 128 + dec_octave + duty 1 + volume 128 Loop 3 note C_, 1 rest 2 EndLoop - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note F#, 4 note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 2 note F#, 1 rest 1 @@ -1276,43 +1276,43 @@ Branch_f59b4: music_ret Branch_f59f9: - musicdx 2 - musice5 64 - musice6 144 + octave 2 + duty 1 + volume 144 musice8 8 note D_, 1 rest 3 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 - musice5 128 - musice6 162 + inc_octave + duty 2 + volume 162 musice8 6 note A_, 1 - musicd8 - musice5 64 - musice6 144 + dec_octave + duty 1 + volume 144 musice8 8 note B_, 1 rest 2 music_ret Branch_f5a17: - musicdx 2 - musice5 64 - musice6 144 + octave 2 + duty 1 + volume 144 musice8 8 note F#, 1 rest 3 note C#, 1 rest 1 - musice5 128 - musice6 162 + duty 2 + volume 162 musice8 6 note A_, 1 - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 note E_, 1 rest 2 @@ -1320,13 +1320,13 @@ Branch_f5a17: Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) - Speed 7 + speed 7 musicdc 17 - musice6 32 - musice7 4 + volume 32 + duty3 4 musice9 96 musice8 8 - musicdx 1 + octave 1 MainLoop Loop 4 Loop 3 @@ -1340,12 +1340,12 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 rest 2 note D_, 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 3 note D_, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note D_, 1 rest 3 @@ -1355,10 +1355,10 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note F#, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1366,12 +1366,12 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 rest 2 note D_, 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 3 note D_, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note D_, 1 rest 3 @@ -1380,10 +1380,10 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1391,10 +1391,10 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 2 @@ -1405,33 +1405,33 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note C#, 1 rest 1 music_call Branch_f5c7e - musicdx 2 + octave 2 note C_, 3 - musicd8 + dec_octave note G_, 1 rest 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave Loop 3 note D_, 1 rest 2 EndLoop - musicd7 + inc_octave note D_, 1 - Speed 1 + speed 1 note F#, 4 rest 3 note A_, 4 rest 3 - musicd7 + inc_octave note D_, 4 rest 3 - Speed 7 + speed 7 rest 3 - musicd8 - musicd8 + dec_octave + dec_octave Loop 3 note D_, 1 rest 2 @@ -1443,14 +1443,14 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) note C#, 1 rest 1 music_call Branch_f5c7e - musicdx 1 + octave 1 note C_, 3 note D_, 1 rest 1 note D#, 1 rest 1 music_call Branch_f5c60 - musicdx 1 + octave 1 musice8 8 note E_, 1 rest 1 @@ -1458,14 +1458,14 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) musice8 6 note B_, 2 music_call Branch_f5c60 - musicdx 1 + octave 1 musice8 8 note F#, 2 note G_, 2 musice8 6 note G#, 2 music_call Branch_f5c6f - musicdx 1 + octave 1 musice8 8 note A_, 1 rest 1 @@ -1473,13 +1473,13 @@ Music_BattleTheme1_Ch3: ; f5a32 (3d:5a32) musice8 6 note E_, 2 music_call Branch_f5c6f - musicdx 1 + octave 1 musice8 8 note B_, 2 - musicd7 + inc_octave note C_, 2 note C#, 2 - musicd8 + dec_octave Loop 2 music_call Branch_f5c4d note E_, 1 @@ -1598,10 +1598,10 @@ Branch_f5b8d: note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1609,10 +1609,10 @@ Branch_f5b8d: note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note G_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1621,10 +1621,10 @@ Branch_f5b8d: note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1633,10 +1633,10 @@ Branch_f5b8d: note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note G_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1644,10 +1644,10 @@ Branch_f5b8d: note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1655,10 +1655,10 @@ Branch_f5b8d: note D_, 1 rest 2 note D_, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note D_, 1 rest 3 @@ -1671,10 +1671,10 @@ Branch_f5b8d: note G_, 1 rest 2 note G_, 1 - musicd7 + inc_octave musice8 3 note B_, 2 - musicd8 + dec_octave musice8 8 note G_, 1 rest 3 @@ -1687,10 +1687,10 @@ Branch_f5b8d: note F#, 1 rest 2 note F#, 1 - musicd7 + inc_octave musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note F#, 1 rest 3 @@ -1702,12 +1702,12 @@ Branch_f5b8d: note F#, 1 rest 2 note F#, 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 3 note C#, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note F#, 1 rest 3 @@ -1719,10 +1719,10 @@ Branch_f5b8d: note E_, 1 rest 2 note E_, 1 - musicd7 + inc_octave musice8 3 note B_, 2 - musicd8 + dec_octave musice8 8 note E_, 1 rest 3 @@ -1734,10 +1734,10 @@ Branch_f5b8d: note A_, 1 rest 2 note A_, 1 - musicd7 + inc_octave musice8 3 note B_, 2 - musicd8 + dec_octave musice8 8 note A_, 1 rest 3 @@ -1776,7 +1776,7 @@ Branch_f5c4d: music_ret Branch_f5c60: - musicdx 1 + octave 1 musice8 8 note E_, 1 rest 1 @@ -1791,7 +1791,7 @@ Branch_f5c60: music_ret Branch_f5c6f: - musicdx 1 + octave 1 musice8 8 note A_, 1 rest 1 @@ -1806,25 +1806,25 @@ Branch_f5c6f: music_ret Branch_f5c7e: - musicdx 1 + octave 1 Loop 3 note C_, 1 rest 2 EndLoop - musicd7 + inc_octave note C_, 1 - Speed 1 + speed 1 note E_, 4 rest 3 note G_, 4 rest 3 - musicd7 + inc_octave note C_, 4 rest 3 - Speed 7 + speed 7 rest 3 - musicd8 - musicd8 + dec_octave + dec_octave Loop 3 note C_, 1 rest 2 @@ -1833,8 +1833,8 @@ Branch_f5c7e: Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) - Speed 7 - musicdx 1 + speed 7 + octave 1 MainLoop Loop 3 note bass, 2 @@ -1860,10 +1860,10 @@ Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) note snare3, 1 note snare1, 1 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 note snare1, 1 note snare1, 1 note snare1, 2 @@ -1886,10 +1886,10 @@ Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) note snare3, 1 note snare1, 1 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 Loop 4 note snare1, 1 EndLoop @@ -1916,10 +1916,10 @@ Music_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) note snare3, 1 note bass, 1 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 Loop 4 note snare1, 1 EndLoop @@ -1975,10 +1975,10 @@ Branch_f5d46: note snare3, 1 note snare1, 1 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 note snare1, 1 note snare1, 1 note snare1, 2 @@ -1990,10 +1990,10 @@ Branch_f5d58: note snare4, 1 note snare1, 2 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 Loop 8 note snare1, 1 EndLoop diff --git a/music/battletheme2.asm b/music/battletheme2.asm index e8cd59b..39a9923 100644 --- a/music/battletheme2.asm +++ b/music/battletheme2.asm @@ -1,27 +1,27 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) - Speed 9 + speed 9 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 8 - musicdx 1 - musice5 64 - musice6 148 + octave 1 + duty 1 + volume 148 Loop 8 note D_, 2 note D_, 1 EndLoop MainLoop - musicdx 1 + octave 1 Loop 23 note D_, 2 note D_, 1 EndLoop - musice5 64 - musice6 160 - musicd7 - musicd7 - Speed 1 + duty 1 + volume 160 + inc_octave + inc_octave + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -29,64 +29,64 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 3 - Speed 9 + speed 9 music_call Branch_f5f3d note C_, 6 - musicd9 - Speed 1 + no_fade + speed 1 note C_, 12 - musice6 55 + volume 55 note C_, 6 - musice6 160 - musicd8 + volume 160 + dec_octave note B_, 12 - musice6 55 + volume 55 note B_, 6 - musice6 160 + volume 160 note G_, 12 - musice6 55 + volume 55 note G_, 6 - Speed 9 - musice6 160 + speed 9 + volume 160 musice8 8 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 musice8 6 note D_, 1 musice8 8 note D_, 9 - musicd9 + no_fade note D_, 9 - musice6 71 + volume 71 note D_, 3 - musice5 128 + duty 2 musice8 8 - musice6 47 + volume 47 note E_, 4 - musice6 96 + volume 96 note E_, 7 - musice6 39 + volume 39 note E_, 1 - musice6 95 + volume 95 note G_, 4 - musice6 128 - Speed 1 + volume 128 + speed 1 note G_, 12 - musice6 39 + volume 39 note G_, 6 - musicd7 - Speed 9 - musice6 127 + inc_octave + speed 9 + volume 127 musice8 8 note C_, 3 - musice5 64 - musice6 160 - musicd8 - Speed 1 + duty 1 + volume 160 + dec_octave + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -94,65 +94,65 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 3 - Speed 9 + speed 9 music_call Branch_f5f3d musice8 8 note C_, 4 - musicd9 - Speed 1 + no_fade + speed 1 note C_, 4 note E_, 5 note F_, 4 note F#, 5 note G_, 12 - musice6 55 + volume 55 note G_, 6 - musice6 160 + volume 160 note E_, 12 - musice6 55 + volume 55 note E_, 6 - Speed 9 - musice6 160 + speed 9 + volume 160 musice8 8 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musice6 160 + volume 160 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musicd8 - musice6 160 + dec_octave + volume 160 musice8 6 note A_, 1 - musicd7 + inc_octave musice8 8 note D_, 9 - musicd9 + no_fade note D_, 10 - musice6 55 + volume 55 note D_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 musice8 8 note D_, 4 note D#, 5 - Speed 9 + speed 9 note E_, 11 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note G_, 5 - musice6 55 + volume 55 note G_, 1 - musice6 160 - musicd7 + volume 160 + inc_octave musice8 8 note C_, 3 - musicd8 - Speed 1 + dec_octave + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -160,28 +160,28 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 3 music_call Branch_f5f90 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice5 64 - musice6 148 - musicdx 1 + duty 1 + volume 148 + octave 1 note D_, 1 Loop 3 note D_, 2 note D_, 1 EndLoop - musice5 128 - musice6 107 - musicd7 - musicd7 + duty 2 + volume 107 + inc_octave + inc_octave note G_, 1 - musicd8 + dec_octave note B_, 1 - musicd7 + inc_octave note G_, 1 note A_, 1 note D_, 1 @@ -189,66 +189,66 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note B_, 1 note D_, 1 note B_, 1 - musice5 64 - musice6 160 + duty 1 + volume 160 music_call Branch_f5f62 - musicdx 4 - musice6 71 + octave 4 + volume 71 note F#, 12 - musice6 160 + volume 160 note C#, 9 - musice6 71 + volume 71 note C#, 1 - musice6 160 + volume 160 note C#, 1 note D_, 1 note E_, 3 note D_, 3 note C#, 3 - musicd8 + dec_octave musice8 6 note B_, 3 musice8 8 note B_, 4 - musice6 71 + volume 71 note B_, 1 - musicd7 - musice6 160 - Speed 1 + inc_octave + volume 160 + speed 1 note C#, 4 - musicd8 + dec_octave note B_, 5 - Speed 9 + speed 9 note A_, 6 - musice6 71 + volume 71 note A_, 1 - musice5 64 - musice6 147 + duty 1 + volume 147 musice8 8 note D_, 2 note D_, 2 rest 2 note C#, 2 - musice5 64 - musice6 160 + duty 1 + volume 160 musice8 8 music_call Branch_f5f62 - musicdx 4 - musice6 71 + octave 4 + volume 71 note F#, 6 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 2 - musicd7 + inc_octave note C#, 2 note D_, 1 - musice6 71 + volume 71 note D_, 1 - musice6 160 + volume 160 note D_, 9 - musice6 71 + volume 71 note D_, 1 - musice6 160 + volume 160 musice8 7 note C#, 1 note D_, 1 @@ -256,10 +256,10 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note E_, 3 note D_, 3 note C#, 3 - musicd8 + dec_octave musice8 6 note A_, 3 - musicd7 + inc_octave musice8 8 note F_, 10 musice8 7 @@ -269,14 +269,14 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note G_, 3 note F_, 3 note E_, 3 - Speed 1 + speed 1 note C_, 2 - musicd9 + no_fade note C_, 16 - musice6 71 + volume 71 note C_, 9 - Speed 9 - musice6 160 + speed 9 + volume 160 musice8 8 note A_, 10 musice8 7 @@ -284,10 +284,10 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note F_, 1 musice8 8 note G_, 6 - musicd7 + inc_octave note C_, 3 - musicd8 - Speed 1 + dec_octave + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -295,31 +295,31 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 3 music_call Branch_f5f90 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice5 64 - musice6 148 - musicdx 1 + duty 1 + volume 148 + octave 1 note D_, 1 Loop 3 note D_, 2 note D_, 1 EndLoop - musice5 64 - musice6 160 + duty 1 + volume 160 musice8 8 - musicdx 5 + octave 5 note D_, 1 note C_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note A_, 1 note G_, 1 note A_, 1 @@ -329,45 +329,45 @@ Music_BattleTheme2_Ch1: ; f5d68 (3d:5d68) note F_, 1 note C_, 1 note D_, 12 - musicd9 + no_fade note D_, 12 - musice5 64 - musice6 148 + duty 1 + volume 148 EndMainLoop Branch_f5f3d: musice8 8 note D_, 12 - musicd9 + no_fade note D_, 4 - musicd9 - Speed 1 + no_fade + speed 1 note D_, 7 - musice6 71 + volume 71 note D_, 2 - musicd9 - Speed 9 + no_fade + speed 9 note D_, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 4 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 7 - musice6 71 + volume 71 note A_, 2 - musicd9 - Speed 9 + no_fade + speed 9 note A_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 12 - musicd9 + no_fade music_ret Branch_f5f62: - musicdx 3 - Speed 1 + octave 3 + speed 1 note C#, 3 note D_, 4 note E_, 3 @@ -375,30 +375,30 @@ Branch_f5f62: note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C#, 3 - Speed 9 + speed 9 note D_, 2 note C#, 2 - musicd8 + dec_octave note A_, 2 note F#, 5 - musice6 71 + volume 71 note F#, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note D_, 2 note C#, 2 - musicd8 + dec_octave note A_, 2 note F#, 2 note G_, 2 note A_, 2 note B_, 1 - musice6 71 + volume 71 note B_, 1 - musice6 160 - musicd7 + volume 160 + inc_octave musice8 6 note F#, 1 musice8 8 @@ -406,38 +406,38 @@ Branch_f5f62: music_ret Branch_f5f90: - musicdx 5 - Speed 9 + octave 5 + speed 9 Loop 3 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice5 64 - musice6 148 - musicdx 1 + duty 1 + volume 148 + octave 1 note D_, 1 Loop 5 note D_, 2 note D_, 1 EndLoop note D_, 2 - musice5 64 - musice6 160 - musicdx 5 + duty 1 + volume 160 + octave 5 note C_, 4 EndLoop music_ret Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) - Speed 9 + speed 9 musicdc 17 - musicea 8 - musiceb 15 + vibrato_rate 8 + vibrato_delay 15 musice8 8 - musicdx 2 - musice5 64 - musice6 116 + octave 2 + duty 1 + volume 116 musice4 5 Loop 8 note D_, 2 @@ -448,106 +448,106 @@ Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) note D_, 2 note D_, 1 EndLoop - musice5 128 - musice6 107 + duty 2 + volume 107 musice4 0 Loop 12 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note A_, 1 EndLoop Loop 10 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 EndLoop - musicd7 + inc_octave note C_, 1 note G_, 1 - musicd7 + inc_octave note C_, 1 note G_, 1 - musice5 64 - musice6 112 - musicd8 + duty 1 + volume 112 + dec_octave note D_, 1 rest 1 - musicd8 + dec_octave musice8 6 note A_, 1 musice8 8 note A_, 9 - musice5 128 - musice6 107 + duty 2 + volume 107 Loop 4 note A_, 1 note D_, 1 note A_, 1 EndLoop - musice5 128 - musicd7 + duty 2 + inc_octave musice8 8 - musice6 47 + volume 47 note C_, 4 - musice6 96 + volume 96 note C_, 7 rest 1 - musice6 95 + volume 95 note E_, 4 - Speed 1 - musice6 128 + speed 1 + volume 128 note E_, 12 rest 6 - Speed 9 - musice6 127 + speed 9 + volume 127 note G_, 3 - musicd8 - musice5 64 - musice6 112 - Speed 1 + dec_octave + duty 1 + volume 112 + speed 1 note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 4 note D_, 3 note E_, 4 note F_, 3 note G_, 3 - Speed 9 - musice5 128 - musice6 107 + speed 9 + duty 2 + volume 107 Loop 9 note A_, 1 note D_, 1 EndLoop Loop 3 note D_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave EndLoop Loop 8 note G_, 1 note C_, 1 EndLoop - Speed 1 + speed 1 note G_, 4 - musice5 64 - musice6 112 - musicd7 + duty 1 + volume 112 + inc_octave note C_, 5 note D_, 4 note D#, 5 - Speed 1 + speed 1 note E_, 12 rest 6 note C_, 12 rest 6 - Speed 9 - musicd8 + speed 9 + dec_octave note G_, 1 rest 1 note A_, 1 @@ -556,31 +556,31 @@ Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 musice8 8 note A_, 9 - musice5 128 - musice6 107 + duty 2 + volume 107 Loop 5 note A_, 1 note D_, 1 EndLoop note A_, 1 - musice5 64 - musice6 112 - Speed 1 + duty 1 + volume 112 + speed 1 note A#, 4 note B_, 5 - Speed 9 - musicd7 + speed 9 + inc_octave note C_, 11 rest 1 note E_, 5 rest 1 note G_, 3 - musicd8 - Speed 1 + dec_octave + speed 1 note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 4 note D_, 3 note E_, 4 @@ -589,20 +589,20 @@ Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) music_call Branch_f618f note A_, 1 rest 1 - musice5 64 - musice6 116 + duty 1 + volume 116 musice4 5 - musicd8 - musicd8 + dec_octave + dec_octave note D_, 1 Loop 3 note D_, 2 note D_, 1 EndLoop - musice5 128 - musice6 107 + duty 2 + volume 107 musice4 0 - musicd7 + inc_octave note E_, 1 rest 1 note E_, 1 @@ -612,150 +612,150 @@ Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) note G_, 1 rest 1 note G_, 1 - musicd7 + inc_octave note C#, 1 - musicd8 + dec_octave note E_, 1 - musicd7 + inc_octave note C#, 1 - musice5 128 - musice6 107 + duty 2 + volume 107 music_call Branch_f6173 - musicdx 4 + octave 4 Loop 4 note D_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 note D_, 1 note G_, 1 - musicd8 + dec_octave note B_, 1 - musicd7 - musicd7 + inc_octave + inc_octave EndLoop Loop 2 note C#, 1 - musicd8 + dec_octave note F#, 1 note A_, 1 note D_, 1 note F#, 1 - musicd8 + dec_octave note A_, 1 - musicd7 - musicd7 + inc_octave + inc_octave EndLoop - musice5 64 - musice6 147 - musicdx 2 + duty 1 + volume 147 + octave 2 rest 1 musice8 8 note B_, 2 note B_, 2 rest 2 note A_, 2 - musicd7 + inc_octave musice8 8 note C#, 1 note D_, 1 note E_, 1 - musice5 128 - musice6 107 + duty 2 + volume 107 music_call Branch_f6173 - musicdx 3 + octave 3 Loop 2 note B_, 1 note D_, 1 note G_, 1 - musicd8 + dec_octave note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave EndLoop Loop 2 - musicd7 + inc_octave note C#, 1 - musicd8 + dec_octave note E_, 1 note A_, 1 note C#, 1 note E_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave EndLoop Loop 2 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 note D_, 1 note F_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave EndLoop Loop 2 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note C_, 1 EndLoop - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 note D_, 1 note F_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 - musicd7 + inc_octave + inc_octave note C_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 note D_, 1 note F_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 - musicd7 + inc_octave + inc_octave note E_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note C_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note C_, 1 - musice5 64 - musice6 112 - musicd8 - Speed 1 + duty 1 + volume 112 + dec_octave + speed 1 note G_, 3 note A_, 4 note B_, 3 - musicd7 + inc_octave note C_, 4 note D_, 3 note E_, 4 @@ -764,91 +764,91 @@ Music_BattleTheme2_Ch2: ; f5fad (3d:5fad) music_call Branch_f618f note A_, 1 rest 1 - musice5 64 - musice6 116 + duty 1 + volume 116 musice4 5 - musicd8 - musicd8 + dec_octave + dec_octave note D_, 1 Loop 3 note D_, 2 note D_, 1 EndLoop rest 12 - musice5 64 - musice6 112 + duty 1 + volume 112 musice4 0 - musicd7 + inc_octave note A_, 12 - musicd9 + no_fade note A_, 12 - musicd8 - musice5 64 - musice6 116 + dec_octave + duty 1 + volume 116 musice4 5 EndMainLoop Branch_f6173: - musicdx 4 + octave 4 Loop 4 note C#, 1 - musicd8 + dec_octave note F#, 1 note A_, 1 note D_, 1 note F#, 1 - musicd8 + dec_octave note A_, 1 - musicd7 - musicd7 + inc_octave + inc_octave EndLoop Loop 4 note D_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 note D_, 1 note G_, 1 - musicd8 + dec_octave note B_, 1 - musicd7 - musicd7 + inc_octave + inc_octave EndLoop music_ret Branch_f618f: - musicdx 4 - Speed 9 + octave 4 + speed 9 Loop 3 note A_, 1 rest 1 - musice6 116 + volume 116 musice4 5 - musicd8 - musicd8 + dec_octave + dec_octave note D_, 1 Loop 5 note D_, 2 note D_, 1 EndLoop note D_, 2 - musice6 112 + volume 112 musice4 0 - musicd7 - musicd7 + inc_octave + inc_octave note G_, 4 EndLoop music_ret Music_BattleTheme2_Ch3: ; f61ac (3d:61ac) - Speed 9 + speed 9 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 64 musice8 7 - musicdx 1 + octave 1 Loop 4 music_call Branch_f62e5 EndLoop @@ -860,7 +860,7 @@ Music_BattleTheme2_Ch3: ; f61ac (3d:61ac) Loop 3 music_call Branch_f62e5 EndLoop - musicdx 1 + octave 1 musice8 4 note D_, 2 musice8 7 @@ -870,189 +870,189 @@ Music_BattleTheme2_Ch3: ; f61ac (3d:61ac) Loop 2 music_call Branch_f62e5 EndLoop - musicdx 1 + octave 1 musice8 8 note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note E_, 1 note F#, 1 - musicd7 + inc_octave note F#, 1 - musicd8 + dec_octave note F#, 1 note G_, 1 - musicd7 + inc_octave note G_, 1 - musicd8 + dec_octave note G_, 1 note A_, 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave note A_, 1 Loop 4 music_call Branch_f62e5 EndLoop - musicdx 1 + octave 1 Loop 4 musice8 4 note E_, 2 musice8 7 note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave EndLoop Loop 4 musice8 4 note A_, 2 musice8 7 note A_, 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave EndLoop Loop 2 music_call Branch_f62e5 EndLoop - musicdx 1 + octave 1 musice8 8 note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 Loop 4 music_call Branch_f62e5 EndLoop - musicdx 1 + octave 1 Loop 4 musice8 4 note E_, 2 musice8 7 note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave EndLoop Loop 2 musice8 4 note G_, 2 musice8 7 note G_, 1 - musicd7 + inc_octave note G_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note G_, 1 - musicd8 + dec_octave EndLoop Loop 2 musice8 4 note A_, 2 musice8 7 note A_, 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave EndLoop Loop 2 musice8 4 note A#, 2 musice8 7 note A#, 1 - musicd7 + inc_octave note A#, 1 - musicd8 + dec_octave note A#, 1 - musicd7 + inc_octave note A#, 1 - musicd8 + dec_octave EndLoop - musicd7 + inc_octave Loop 2 musice8 4 note C_, 2 musice8 7 note C_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note C_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave EndLoop - musicd8 + dec_octave Loop 2 musice8 4 note A#, 2 musice8 7 note A#, 1 - musicd7 + inc_octave note A#, 1 - musicd8 + dec_octave note A#, 1 - musicd7 + inc_octave note A#, 1 - musicd8 + dec_octave EndLoop - musicd7 + inc_octave Loop 2 musice8 4 note C_, 2 musice8 7 note C_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note C_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave EndLoop Loop 3 Loop 3 music_call Branch_f62e5 EndLoop - musicdx 1 + octave 1 musice8 4 note D_, 2 musice8 7 @@ -1062,15 +1062,15 @@ Music_BattleTheme2_Ch3: ; f61ac (3d:61ac) Loop 2 music_call Branch_f62e5 EndLoop - musicdx 2 + octave 2 musice8 8 note D_, 1 note C_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note A_, 1 note G_, 1 note A_, 1 @@ -1085,22 +1085,22 @@ Music_BattleTheme2_Ch3: ; f61ac (3d:61ac) EndMainLoop Branch_f62e5: - musicdx 1 + octave 1 musice8 4 note D_, 2 musice8 7 note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note D_, 1 music_ret Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3) - Speed 9 + speed 9 Loop 2 rest 12 EndLoop @@ -1143,10 +1143,10 @@ Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3) note snare3, 1 note bass, 1 note snare3, 1 - Speed 1 + speed 1 note snare3, 4 note snare2, 5 - Speed 9 + speed 9 note snare1, 3 Loop 12 note snare1, 1 @@ -1164,10 +1164,10 @@ Music_BattleTheme2_Ch4: ; f62f3 (3d:62f3) note bass, 1 note bass, 1 note snare1, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 5 - Speed 9 + speed 9 note snare1, 1 note snare1, 1 note snare1, 1 diff --git a/music/battletheme3.asm b/music/battletheme3.asm index b24341d..7ddeff8 100644 --- a/music/battletheme3.asm +++ b/music/battletheme3.asm @@ -1,506 +1,506 @@ Music_BattleTheme3_Ch1: ; f63a1 (3d:63a1) - Speed 11 + speed 11 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 8 MainLoop - musicdx 2 - musice5 0 + octave 2 + duty 0 Loop 4 Loop 4 - musice6 146 + volume 146 note F#, 2 rest 1 EndLoop - musice6 144 + volume 144 note E_, 2 - musice6 149 + volume 149 note F_, 2 EndLoop Loop 4 music_call Branch_f67b2 EndLoop - musice5 64 - musice6 160 + duty 1 + volume 160 Loop 2 - musicdx 3 + octave 3 note C#, 1 note F#, 1 - Speed 1 + speed 1 note G#, 5 - musice6 55 + volume 55 note G#, 6 music_call Branch_f65a7 - musicdx 3 + octave 3 note D_, 1 note F#, 1 - Speed 1 + speed 1 note B_, 5 - musice6 55 + volume 55 note B_, 6 music_call Branch_f65a7 EndLoop - musice5 0 - musice6 163 - musicd8 + duty 0 + volume 163 + dec_octave rest 2 - Speed 1 + speed 1 note E_, 5 - musice6 39 + volume 39 note E_, 6 music_call Branch_f65cf note F#, 5 - musice6 39 + volume 39 note F#, 6 - Speed 11 + speed 11 rest 1 - musicd8 - musice5 0 - musice6 163 - Speed 1 + dec_octave + duty 0 + volume 163 + speed 1 note E_, 5 - musice6 39 + volume 39 note E_, 6 music_call Branch_f65cf - Speed 11 - musice5 64 - musice6 160 + speed 11 + duty 1 + volume 160 Loop 2 - musicdx 3 + octave 3 note C#, 1 note F#, 1 - Speed 1 + speed 1 note G#, 5 - musice6 55 + volume 55 note G#, 6 music_call Branch_f65a7 - musicdx 3 + octave 3 note D_, 1 note F#, 1 - Speed 1 + speed 1 note B_, 5 - musice6 55 + volume 55 note B_, 6 - musice6 160 + volume 160 music_call Branch_f65a7 EndLoop - musiceb 10 - musice5 0 + vibrato_delay 10 + duty 0 Loop 2 - musicdx 2 + octave 2 rest 4 - musice6 144 + volume 144 note F#, 2 - musice6 39 + volume 39 note F#, 2 rest 2 - musice6 144 + volume 144 note E_, 2 - musice6 39 + volume 39 note E_, 4 - musice6 144 + volume 144 note D#, 2 - musice6 39 + volume 39 note D#, 4 - musice6 144 + volume 144 note D_, 2 note C#, 2 EndLoop - musiceb 20 - musice5 128 + vibrato_delay 20 + duty 2 musice8 6 Loop 4 music_call Branch_f661d EndLoop - musicdx 4 - musice6 112 + octave 4 + volume 112 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 112 + volume 112 note F#, 5 - musice6 39 + volume 39 note F#, 6 Loop 3 music_call Branch_f661d EndLoop - musicdx 4 - musice6 112 + octave 4 + volume 112 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 112 + volume 112 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musicd7 - musice6 112 + inc_octave + volume 112 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musicd8 - musice6 112 + dec_octave + volume 112 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musicd8 - Speed 11 - musice5 64 - musice6 144 + dec_octave + speed 11 + duty 1 + volume 144 musice8 8 note D_, 2 note C#, 2 - musicd8 + dec_octave note F#, 3 - musicd7 - Speed 1 + inc_octave + speed 1 note D_, 3 note D#, 2 note E_, 3 note F_, 3 - Speed 11 + speed 11 note F#, 4 - musicd8 + dec_octave note G#, 3 - musicd7 - Speed 1 + inc_octave + speed 1 note E_, 3 note F_, 2 note F#, 3 note G_, 3 - Speed 11 + speed 11 note G#, 4 - musice5 0 - musicdx 2 + duty 0 + octave 2 Loop 2 Loop 4 - musice6 144 + volume 144 note F#, 1 - musice6 55 + volume 55 note F#, 1 rest 1 EndLoop - musice6 144 + volume 144 note F#, 1 - musice6 55 + volume 55 note F#, 1 - musice6 144 + volume 144 note F#, 1 - musice6 55 + volume 55 note F#, 1 Loop 4 - musice6 144 + volume 144 note G_, 1 - musice6 55 + volume 55 note G_, 1 rest 1 EndLoop - musice6 144 + volume 144 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 144 + volume 144 note G_, 1 - musice6 55 + volume 55 note G_, 1 EndLoop - musice5 64 - musice6 160 - musicdx 3 + duty 1 + volume 160 + octave 3 note C#, 1 note F#, 1 - Speed 1 + speed 1 note G#, 5 - musice6 55 + volume 55 note G#, 6 music_call Branch_f65a7 - musicdx 3 + octave 3 note C#, 1 note F#, 1 - Speed 1 + speed 1 note G#, 5 - musice6 55 + volume 55 note G#, 6 - musicd7 - musice6 160 - Speed 11 + inc_octave + volume 160 + speed 11 note C#, 9 - musice6 55 + volume 55 note C#, 2 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 1 - musicd7 + inc_octave note C#, 1 note F#, 1 note C#, 1 - musicd8 - Speed 1 + dec_octave + speed 1 note B_, 5 - musice6 55 + volume 55 note B_, 6 - Speed 11 - musice6 160 + speed 11 + volume 160 note F#, 9 - musice6 55 + volume 55 note F#, 4 - musice6 160 + volume 160 note G#, 1 note A_, 1 - Speed 1 + speed 1 note G#, 5 - musice6 55 + volume 55 note G#, 6 - musice6 160 - Speed 11 + volume 160 + speed 11 note B_, 8 - musice6 55 + volume 55 note B_, 1 - musice6 160 + volume 160 note A_, 2 note B_, 1 - musicd9 - Speed 1 + no_fade + speed 1 note B_, 5 - musice6 55 + volume 55 note B_, 6 - Speed 11 - musicd7 - musice6 160 + speed 11 + inc_octave + volume 160 note C#, 1 note D_, 1 - Speed 1 + speed 1 note C#, 5 - musice6 55 + volume 55 note C#, 6 - musice6 160 - Speed 11 + volume 160 + speed 11 note E_, 10 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note D_, 1 - Speed 1 + speed 1 note C#, 8 - musice6 55 + volume 55 note C#, 3 - musicd8 - musice6 160 - Speed 11 + dec_octave + volume 160 + speed 11 note B_, 1 - musicd7 + inc_octave note C#, 1 - musicd8 - Speed 1 + dec_octave + speed 1 note B_, 5 - musice6 55 + volume 55 note B_, 6 - Speed 11 - musice6 160 + speed 11 + volume 160 note E_, 10 - musice6 55 + volume 55 note E_, 3 - musice6 31 + volume 31 note A_, 3 - musice6 96 + volume 96 note A_, 5 - musicd7 - musice6 63 + inc_octave + volume 63 note E_, 3 - musice6 127 + volume 127 note E_, 3 - musice6 160 + volume 160 note E_, 2 - musice5 64 + duty 1 Loop 4 Loop 4 - musice6 144 + volume 144 note G#, 1 - musice6 55 + volume 55 note G#, 1 rest 1 EndLoop - musice6 144 + volume 144 note G#, 1 - musice6 55 + volume 55 note G#, 1 - musice6 144 + volume 144 note G#, 1 - musice6 55 + volume 55 note G#, 1 Loop 4 - musice6 144 + volume 144 note A_, 1 - musice6 55 + volume 55 note A_, 1 rest 1 EndLoop - musice6 144 + volume 144 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 144 + volume 144 note A_, 1 - musice6 55 + volume 55 note A_, 1 EndLoop EndMainLoop Branch_f65a7: - Speed 11 - musicdx 4 - musice6 160 + speed 11 + octave 4 + volume 160 note C#, 5 - musicd9 + no_fade note C#, 4 - musice6 55 + volume 55 note C#, 2 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 1 - musicd7 + inc_octave note C#, 1 note F#, 1 note C#, 1 - musicd8 - Speed 1 + dec_octave + speed 1 note B_, 5 - musice6 55 + volume 55 note B_, 6 - Speed 11 - musice6 160 - musicd7 + speed 11 + volume 160 + inc_octave note C#, 5 - musicd9 + no_fade note C#, 4 - musice6 55 + volume 55 note C#, 4 - musice6 160 + volume 160 music_ret Branch_f65cf: - musicdx 3 + octave 3 Loop 3 - Speed 11 + speed 11 rest 2 - Speed 1 - musice6 163 + speed 1 + volume 163 note E_, 5 - musice6 39 + volume 39 note E_, 6 EndLoop - musice5 128 - musice6 128 + duty 2 + volume 128 note D_, 5 note G_, 6 note B_, 5 - musicd7 + inc_octave note D_, 6 - musicd8 + dec_octave note G_, 5 note B_, 6 - musicd7 + inc_octave note D_, 5 note G_, 6 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice5 0 - musice6 163 - Speed 11 + duty 0 + volume 163 + speed 11 rest 1 - musicd8 - Speed 1 + dec_octave + speed 1 note E_, 5 - musice6 39 + volume 39 note E_, 6 Loop 3 - Speed 11 + speed 11 rest 2 - Speed 1 - musice6 163 + speed 1 + volume 163 note E_, 5 - musice6 39 + volume 39 note E_, 6 EndLoop - musicd8 - musice5 128 - musice6 128 + dec_octave + duty 2 + volume 128 note B_, 5 - musicd7 + inc_octave note E_, 6 note G_, 5 note B_, 6 note E_, 5 note G_, 6 note B_, 5 - musicd7 + inc_octave note E_, 6 music_ret Branch_f661d: - musicdx 4 - Speed 1 - musice6 112 + octave 4 + speed 1 + volume 112 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 112 + volume 112 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musicd7 - musice6 112 + inc_octave + volume 112 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musicd8 - musice6 112 + dec_octave + volume 112 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musicd7 - musice6 112 + inc_octave + volume 112 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musicd8 - musice6 112 + dec_octave + volume 112 note F#, 5 - musice6 39 + volume 39 note F#, 6 music_ret Music_BattleTheme3_Ch2: ; f6649 (3d:6649) - Speed 11 + speed 11 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 8 MainLoop - musicdx 2 - musice5 0 + octave 2 + duty 0 musice4 3 Loop 4 Loop 4 - musice6 130 + volume 130 note F#, 2 rest 1 EndLoop - musice6 128 + volume 128 note E_, 2 - musice6 133 + volume 133 note F_, 2 EndLoop musice4 0 - musicdx 3 + octave 3 Loop 4 rest 6 - musice6 163 + volume 163 note E_, 1 - musice6 39 + volume 39 note E_, 1 rest 8 EndLoop @@ -512,37 +512,37 @@ Music_BattleTheme3_Ch2: ; f6649 (3d:6649) music_call Branch_f680a EndLoop EndLoop - musicdx 2 - musice6 163 - Speed 11 + octave 2 + volume 163 + speed 11 rest 1 - Speed 1 + speed 1 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 163 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 music_call Branch_f6866 - musicdx 4 + octave 4 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musicd8 - musicd8 - musice5 0 - musice6 163 + dec_octave + dec_octave + duty 0 + volume 163 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 163 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 music_call Branch_f6866 - musice5 0 - musice6 144 + duty 0 + volume 144 Loop 2 Loop 2 music_call Branch_f67b2 @@ -551,373 +551,373 @@ Music_BattleTheme3_Ch2: ; f6649 (3d:6649) music_call Branch_f680a EndLoop EndLoop - musiceb 10 + vibrato_delay 10 Loop 4 - musice6 163 + volume 163 musice8 6 note F#, 1 note F#, 1 musice8 8 - Speed 1 + speed 1 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice6 163 + volume 163 musice8 6 - Speed 11 + speed 11 note F#, 1 - musicd7 - musice6 144 + inc_octave + volume 144 musice8 8 note C#, 2 - musicd8 - musice6 163 + dec_octave + volume 163 musice8 6 note F#, 1 note F#, 1 - Speed 1 + speed 1 musice8 8 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice6 163 + volume 163 musice8 6 - Speed 11 + speed 11 note F#, 1 - musice6 144 + volume 144 musice8 8 note B_, 2 - musice6 163 + volume 163 musice8 6 note F#, 1 note F#, 1 musice8 8 - Speed 1 + speed 1 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice6 163 + volume 163 musice8 6 - Speed 11 + speed 11 note F#, 1 - musice6 144 + volume 144 musice8 8 note B_, 2 - musice6 163 + volume 163 musice8 6 note F#, 1 note F#, 1 - Speed 1 + speed 1 musice8 8 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice6 163 + volume 163 musice8 6 - Speed 11 + speed 11 note F#, 1 musice8 8 - musice6 144 + volume 144 note A_, 2 note G#, 2 EndLoop - musiceb 20 + vibrato_delay 20 note D_, 3 - Speed 1 + speed 1 note A#, 3 note B_, 2 - musicd7 + inc_octave note C_, 3 note C#, 3 - Speed 11 + speed 11 note D_, 4 - musicd8 + dec_octave note E_, 3 - musicd7 - Speed 1 + inc_octave + speed 1 note C_, 3 note C#, 2 note D_, 3 note D#, 3 - Speed 11 + speed 11 note E_, 4 - musicdx 3 + octave 3 Loop 6 Loop 4 - musice6 144 + volume 144 note C#, 1 - musice6 55 + volume 55 note C#, 1 rest 1 EndLoop - musice6 144 + volume 144 note C#, 1 - musice6 55 + volume 55 note C#, 1 - musice6 144 + volume 144 note C#, 1 - musice6 55 + volume 55 note C#, 1 Loop 4 - musice6 144 + volume 144 note D_, 1 - musice6 55 + volume 55 note D_, 1 rest 1 EndLoop - musice6 144 + volume 144 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 144 + volume 144 note D_, 1 - musice6 55 + volume 55 note D_, 1 EndLoop - musice5 64 - musicd7 + duty 1 + inc_octave Loop 4 Loop 4 - musice6 128 + volume 128 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 EndLoop - musice6 128 + volume 128 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 128 + volume 128 note E_, 1 - musice6 55 + volume 55 note E_, 1 Loop 4 - musice6 128 + volume 128 note D_, 1 - musice6 55 + volume 55 note D_, 1 rest 1 EndLoop - musice6 128 + volume 128 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice6 128 + volume 128 note D_, 1 - musice6 55 + volume 55 note D_, 1 EndLoop EndMainLoop Branch_f67b2: - musicdx 2 - musice6 163 - Speed 11 + octave 2 + volume 163 + speed 11 rest 1 - Speed 1 + speed 1 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice6 163 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 - musice6 163 + volume 163 note F#, 5 - musice6 39 + volume 39 note F#, 6 - musice6 163 - Speed 11 + volume 163 + speed 11 rest 1 - Speed 1 + speed 1 note F#, 5 - musice6 55 + volume 55 note F#, 6 - musicd7 - musice6 163 - Speed 11 + inc_octave + volume 163 + speed 11 note C_, 1 - musicd8 - Speed 1 + dec_octave + speed 1 note B_, 5 - musice6 39 + volume 39 note B_, 6 - Speed 11 + speed 11 rest 1 - Speed 1 - musice6 163 + speed 1 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 - Speed 11 + speed 11 rest 1 - Speed 1 - musice6 163 + speed 1 + volume 163 note B_, 5 - musice6 39 + volume 39 note B_, 6 - musice6 163 + volume 163 note A_, 4 note B_, 4 note A_, 3 note F#, 5 - musice6 39 + volume 39 note F#, 6 - Speed 11 - musice6 144 + speed 11 + volume 144 note E_, 1 - musice6 163 + volume 163 note F_, 1 music_ret Branch_f680a: - musicdx 2 - musice6 163 - Speed 11 + octave 2 + volume 163 + speed 11 rest 1 - Speed 1 + speed 1 note G_, 5 - musice6 39 + volume 39 note G_, 6 - musice6 163 + volume 163 note B_, 5 - musice6 39 + volume 39 note B_, 6 - musice6 163 + volume 163 note G_, 5 - musice6 39 + volume 39 note G_, 6 - Speed 11 + speed 11 rest 1 - Speed 1 - musice6 163 + speed 1 + volume 163 note G_, 5 - musice6 39 + volume 39 note G_, 6 - musicd7 - musice6 163 - Speed 11 + inc_octave + volume 163 + speed 11 note C#, 1 - Speed 1 + speed 1 note C_, 5 - musice6 39 + volume 39 note C_, 6 - musice6 163 - Speed 11 + volume 163 + speed 11 rest 1 - musicd8 - Speed 1 + dec_octave + speed 1 note B_, 5 - musice6 39 + volume 39 note B_, 6 - Speed 11 + speed 11 rest 1 - musicd7 - Speed 1 - musice6 163 + inc_octave + speed 1 + volume 163 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musicd8 - musice6 163 + dec_octave + volume 163 note B_, 4 - musicd7 + inc_octave note C#, 4 - musicd8 + dec_octave note B_, 3 note G_, 5 - musice6 39 + volume 39 note G_, 6 - Speed 11 - musice6 144 + speed 11 + volume 144 note B_, 1 - musice6 163 + volume 163 note G_, 1 music_ret Branch_f6866: - musicdx 2 + octave 2 Loop 3 - Speed 11 + speed 11 rest 1 - Speed 1 - musice6 163 + speed 1 + volume 163 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 163 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 EndLoop - musice5 128 - musice6 112 + duty 2 + volume 112 note B_, 5 - musicd7 + inc_octave note D_, 6 note G_, 5 note B_, 6 note D_, 5 note G_, 6 note B_, 5 - musicd7 + inc_octave note D_, 6 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musicd8 - musicd8 - musice5 0 - musice6 163 + dec_octave + dec_octave + duty 0 + volume 163 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 163 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 Loop 3 - Speed 11 + speed 11 rest 1 - Speed 1 - musice6 163 + speed 1 + volume 163 note C#, 5 - musice6 39 + volume 39 note C#, 6 - musice6 163 + volume 163 note A_, 5 - musice6 39 + volume 39 note A_, 6 EndLoop - musice5 128 - musice6 112 + duty 2 + volume 112 note G_, 5 note B_, 6 - musicd7 + inc_octave note E_, 5 note G_, 6 - musicd8 + dec_octave note B_, 5 - musicd7 + inc_octave note E_, 6 note G_, 5 note B_, 6 - musicd7 + inc_octave music_ret Music_BattleTheme3_Ch3: ; f68c2 (3d:68c2) - Speed 11 + speed 11 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 96 - musicea 8 - musiceb 0 + vibrato_rate 8 + vibrato_delay 0 musice8 8 MainLoop - musicdx 1 + octave 1 Loop 4 Loop 4 musice8 4 @@ -934,7 +934,7 @@ Music_BattleTheme3_Ch3: ; f68c2 (3d:68c2) Loop 2 music_call Branch_f6992 EndLoop - musicdx 1 + octave 1 Loop 2 Loop 4 note F#, 1 @@ -952,44 +952,44 @@ Music_BattleTheme3_Ch3: ; f68c2 (3d:68c2) Loop 2 music_call Branch_f6992 EndLoop - musiceb 10 - musicdx 1 + vibrato_delay 10 + octave 1 Loop 3 music_call Branch_f69f0 - Speed 11 - musicdx 3 + speed 11 + octave 3 musice8 8 note D_, 2 note C#, 2 - musicd8 - musicd8 + dec_octave + dec_octave EndLoop music_call Branch_f69f0 - musicdx 1 + octave 1 musice8 8 note F#, 2 note E_, 2 - musiceb 0 + vibrato_delay 0 note D_, 3 - Speed 1 + speed 1 note A#, 3 note B_, 2 - musicd7 + inc_octave note C_, 3 note C#, 3 - Speed 11 + speed 11 note D_, 4 - musicd8 + dec_octave note E_, 3 - musicd7 - Speed 1 + inc_octave + speed 1 note C_, 3 note C#, 2 note D_, 3 note D#, 3 - Speed 11 + speed 11 note E_, 4 - musicd8 + dec_octave Loop 6 Loop 4 note F#, 1 @@ -1006,50 +1006,50 @@ Music_BattleTheme3_Ch3: ; f68c2 (3d:68c2) EndLoop musice8 7 Loop 4 - musicd7 + inc_octave Loop 4 note F#, 1 - musicd8 + dec_octave note F#, 1 note F#, 1 - musicd7 + inc_octave EndLoop note F#, 1 - musicd8 + dec_octave note F#, 1 - musicd7 + inc_octave note F#, 1 - musicd8 + dec_octave note F#, 1 - musicd7 + inc_octave Loop 4 note E_, 1 - musicd8 + dec_octave note E_, 1 note E_, 1 - musicd7 + inc_octave EndLoop note E_, 1 - musicd8 + dec_octave note E_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note E_, 1 EndLoop musice8 8 EndMainLoop Branch_f6973: - musicdx 1 + octave 1 note F#, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note E_, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note F#, 1 rest 2 @@ -1058,28 +1058,28 @@ Branch_f6973: rest 1 note F#, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note E_, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note E_, 2 note F_, 2 music_ret Branch_f6992: - musicdx 1 + octave 1 music_call Branch_f6973 note F#, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note E_, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note F#, 1 rest 2 @@ -1088,24 +1088,24 @@ Branch_f6992: rest 1 note F#, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note E_, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note F#, 1 rest 1 note F#, 2 note G_, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note F#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note G_, 1 rest 2 @@ -1114,23 +1114,23 @@ Branch_f6992: rest 1 note G_, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note F#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note F_, 2 note F#, 2 note G_, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note F#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note G_, 1 rest 2 @@ -1139,12 +1139,12 @@ Branch_f6992: rest 1 note G_, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note F#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note G_, 1 rest 1 @@ -1152,74 +1152,74 @@ Branch_f6992: music_ret Branch_f69f0: - musicdx 1 + octave 1 musice8 6 note F#, 1 - musicd7 + inc_octave note C#, 1 - musicd7 + inc_octave musice8 4 note C#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 8 note F#, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 - musicd7 + inc_octave note C#, 1 - musicd7 + inc_octave musice8 4 note C#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 8 note E_, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 - musicd7 + inc_octave note C#, 1 - musicd7 + inc_octave musice8 4 note C#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 8 note D#, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 - musicd7 + inc_octave note C#, 1 - musicd7 + inc_octave musice8 4 note C#, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 6 note F#, 1 music_ret Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) - Speed 11 + speed 11 MainLoop Loop 2 Loop 4 @@ -1247,10 +1247,10 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note bass, 1 EndLoop note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 note snare1, 1 Loop 3 @@ -1266,10 +1266,10 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note bass, 1 note snare4, 2 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 note snare1, 1 Loop 7 @@ -1285,24 +1285,24 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note bass, 1 note snare4, 2 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 note snare1, 1 music_call Branch_f6b7e - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 note bass, 1 music_call Branch_f6b7e - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 2 Loop 7 music_call Branch_f6b40 @@ -1317,23 +1317,23 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note bass, 1 note snare4, 2 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 note snare1, 5 note snare1, 6 note snare1, 5 note snare1, 6 - Speed 11 + speed 11 music_call Branch_f6b4d note snare3, 1 note snare1, 1 note bass, 1 music_call Branch_f6b4d - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 note bass, 1 music_call Branch_f6b4d @@ -1341,14 +1341,14 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note snare1, 1 note bass, 1 music_call Branch_f6b4d - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 2 note snare5, 8 rest 4 - Speed 1 + speed 1 note snare2, 3 note snare2, 2 note snare1, 6 @@ -1356,29 +1356,29 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note snare1, 6 note snare1, 5 note snare1, 6 - Speed 11 + speed 11 note snare1, 1 Loop 7 music_call Branch_f6b65 - Speed 1 + speed 1 note bass, 6 EndLoop music_call Branch_f6b65 - Speed 1 + speed 1 note snare1, 6 Loop 15 music_call Branch_f6b65 - Speed 1 + speed 1 note bass, 6 EndLoop - Speed 11 + speed 11 note bass, 1 - Speed 1 + speed 1 note snare3, 5 note bass, 6 - Speed 11 + speed 11 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare4, 6 note snare3, 5 @@ -1391,7 +1391,7 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note snare1, 6 music_call Branch_f6b9a note bass, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 note snare1, 5 @@ -1399,7 +1399,7 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note snare1, 5 note snare1, 6 music_call Branch_f6b9a - Speed 1 + speed 1 note bass, 5 note snare2, 6 note snare1, 5 @@ -1408,7 +1408,7 @@ Music_BattleTheme3_Ch4: ; f6a3f (3d:6a3f) note snare1, 6 note snare1, 5 note snare1, 6 - Speed 11 + speed 11 EndMainLoop Branch_f6b40: @@ -1453,23 +1453,23 @@ Branch_f6b4d: music_ret Branch_f6b65: - Speed 11 + speed 11 note bass, 1 - Speed 1 + speed 1 note snare3, 5 note bass, 6 - Speed 11 + speed 11 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare4, 6 note snare3, 5 note snare2, 6 note snare3, 5 note bass, 6 - Speed 11 + speed 11 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 music_ret @@ -1504,24 +1504,24 @@ Branch_f6b7e: music_ret Branch_f6b9a: - Speed 11 + speed 11 Loop 3 Loop 5 note bass, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 EndLoop note bass, 1 EndLoop Loop 4 note bass, 1 - Speed 1 + speed 1 note snare3, 5 note snare2, 6 - Speed 11 + speed 11 note snare1, 1 EndLoop music_ret diff --git a/music/boosterpack.asm b/music/boosterpack.asm index 871c9e4..dc319ff 100644 --- a/music/boosterpack.asm +++ b/music/boosterpack.asm @@ -1,114 +1,114 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 4 - musice5 64 - Speed 1 - musice6 160 + octave 4 + duty 1 + speed 1 + volume 160 note D#, 5 - musice6 55 + volume 55 note D#, 1 - musice6 160 + volume 160 note G_, 5 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note A#, 5 - musice6 55 + volume 55 note A#, 2 - musice6 160 + volume 160 note F_, 5 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note A_, 5 - musice6 55 + volume 55 note A_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 5 - musice6 55 + volume 55 note C_, 2 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 16 - musicd9 + no_fade note B_, 16 - musicd9 + no_fade note B_, 6 - musice6 55 + volume 55 note B_, 9 music_end Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 3 - musice5 64 - Speed 1 - musice6 144 + octave 3 + duty 1 + speed 1 + volume 144 note A#, 5 - musice6 39 + volume 39 note A#, 1 - musicd7 - musice6 144 + inc_octave + volume 144 note D#, 5 - musice6 39 + volume 39 note D#, 1 - musice6 144 + volume 144 note G_, 5 - musice6 39 + volume 39 note G_, 2 - musice6 144 + volume 144 note C_, 5 - musice6 39 + volume 39 note C_, 1 - musice6 144 + volume 144 note F_, 5 - musice6 39 + volume 39 note F_, 1 - musice6 144 + volume 144 note A_, 5 - musice6 39 + volume 39 note A_, 2 - musice6 144 + volume 144 note G_, 16 - musicd9 + no_fade note G_, 16 - musicd9 + no_fade note G_, 6 - musice6 39 + volume 39 note G_, 9 music_end Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) musicdc 17 - musice7 1 - musice6 32 + duty3 1 + volume 32 musice8 8 musice9 0 - musicdx 1 - Speed 1 + octave 1 + speed 1 note D#, 6 note A#, 6 - musicd7 + inc_octave note D#, 7 - musicd8 + dec_octave note F_, 6 - musicd7 + inc_octave note C_, 6 note F_, 7 - musicd8 + dec_octave note G_, 16 - musicd9 + no_fade note G_, 16 - musicd9 + no_fade note G_, 6 music_end ; 0xf7df8
\ No newline at end of file diff --git a/music/cardpop.asm b/music/cardpop.asm index 52ae065..bd1d1c9 100644 --- a/music/cardpop.asm +++ b/music/cardpop.asm @@ -1,118 +1,118 @@ Music_CardPop_Ch1: ; f703a (3d:703a) - Speed 4 + speed 4 musicdc 17 musice8 8 - musice5 128 - musice6 144 + duty 2 + volume 144 MainLoop Loop 7 rest 16 EndLoop rest 14 Loop 2 - musicdx 5 + octave 5 musice8 8 note F#, 1 note G_, 1 musice8 6 note F#, 1 - musice6 55 + volume 55 note F#, 1 - musice6 144 + volume 144 note D_, 1 - musice6 55 + volume 55 note F#, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note A_, 1 - musicd7 - musice6 55 + inc_octave + volume 55 note D_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note G_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 144 + volume 144 note F#, 1 - musice6 55 + volume 55 note G_, 1 - musice6 144 + volume 144 note D_, 1 - musice6 55 + volume 55 note G_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note A_, 1 - musice6 55 - musicd7 + volume 55 + inc_octave note D_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note G_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 144 + volume 144 note F#, 1 - musice6 55 + volume 55 note G_, 1 rest 1 note F#, 1 rest 12 rest 16 rest 14 - musicdx 5 - musice6 144 + octave 5 + volume 144 musice8 8 note E_, 1 note F_, 1 musice8 6 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 144 + volume 144 note C_, 1 - musice6 55 + volume 55 note E_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note G_, 1 - musicd7 - musice6 55 + inc_octave + volume 55 note C_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note F_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 144 + volume 144 note E_, 1 - musice6 55 + volume 55 note F_, 1 - musice6 144 + volume 144 note C_, 1 - musice6 55 + volume 55 note E_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note G_, 1 - musice6 55 - musicd7 + volume 55 + inc_octave note C_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note F_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 144 + volume 144 note E_, 1 - musice6 55 + volume 55 note F_, 1 rest 1 note E_, 1 rest 12 rest 16 - musice6 144 + volume 144 rest 14 EndLoop rest 2 @@ -120,96 +120,96 @@ Music_CardPop_Ch1: ; f703a (3d:703a) Music_CardPop_Ch2: ; f70df (3d:70df) - Speed 4 + speed 4 musicdc 17 musice8 8 - musice5 128 - musice6 96 + duty 2 + volume 96 musice8 3 Loop 2 - musicdx 2 + octave 2 note A_, 2 - musicd7 + inc_octave note A_, 2 - musicd7 + inc_octave note A_, 2 - musicd8 + dec_octave note A_, 2 - musicd7 - musicd7 + inc_octave + inc_octave note A_, 2 - musicd8 + dec_octave note A_, 2 - musicd8 + dec_octave note A_, 2 - musicd7 - musicd7 + inc_octave + inc_octave note A_, 2 - musicd8 - musicd8 + dec_octave + dec_octave note A_, 2 - musicd8 + dec_octave note A_, 2 - musicd7 + inc_octave note A_, 2 - musicd7 + inc_octave note A_, 2 - musicd7 + inc_octave note A_, 2 - musicd8 + dec_octave note A_, 2 - musicd8 + dec_octave note A_, 2 - musicd7 - musicd7 + inc_octave + inc_octave note A_, 2 EndLoop Loop 2 - musicdx 2 + octave 2 note G_, 2 - musicd7 + inc_octave note G_, 2 - musicd7 + inc_octave note G_, 2 - musicd8 + dec_octave note G_, 2 - musicd7 - musicd7 + inc_octave + inc_octave note G_, 2 - musicd8 + dec_octave note G_, 2 - musicd8 + dec_octave note G_, 2 - musicd7 - musicd7 + inc_octave + inc_octave note G_, 2 - musicd8 - musicd8 + dec_octave + dec_octave note G_, 2 - musicd8 + dec_octave note G_, 2 - musicd7 + inc_octave note G_, 2 - musicd7 + inc_octave note G_, 2 - musicd7 + inc_octave note G_, 2 - musicd8 + dec_octave note G_, 2 - musicd8 + dec_octave note G_, 2 - musicd7 - musicd7 + inc_octave + inc_octave note G_, 2 EndLoop EndMainLoop Music_CardPop_Ch3: ; f713a (3d:713a) - Speed 4 - musice7 1 + speed 4 + duty3 1 musicdc 17 - musice6 32 + volume 32 musice9 0 musice8 8 music_call Branch_f715b @@ -227,13 +227,13 @@ Music_CardPop_Ch3: ; f713a (3d:713a) EndMainLoop Branch_f715b: - musicdx 1 + octave 1 note D_, 2 rest 2 note D_, 4 - musicd7 + inc_octave note D_, 2 - musicd8 + dec_octave note D_, 2 rest 2 note F#, 2 @@ -246,13 +246,13 @@ Branch_f715b: music_ret Branch_f716c: - musicdx 1 + octave 1 note C_, 2 rest 2 note C_, 4 - musicd7 + inc_octave note C_, 2 - musicd8 + dec_octave note C_, 2 rest 2 note E_, 2 @@ -266,8 +266,8 @@ Branch_f716c: Music_CardPop_Ch4: ; f717d (3d:717d) - Speed 4 - musicdx 1 + speed 4 + octave 1 Loop 11 music_call Branch_f7196 note snare4, 4 diff --git a/music/challengehall.asm b/music/challengehall.asm index a2377a2..deba329 100644 --- a/music/challengehall.asm +++ b/music/challengehall.asm @@ -1,346 +1,346 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) musicdc 17 - musicea 8 - musiceb 15 + vibrato_rate 8 + vibrato_delay 15 musice8 7 - musicdx 3 - musice5 128 - musice6 128 + octave 3 + duty 2 + volume 128 musice8 8 - Speed 1 + speed 1 note A_, 7 note G#, 4 - musice6 23 + volume 23 note G#, 4 - musice6 128 + volume 128 note A_, 4 - musice6 23 + volume 23 note A_, 3 - musice6 128 + volume 128 note B_, 4 - musice6 23 + volume 23 note B_, 4 - musicd7 - musice6 128 + inc_octave + volume 128 note C#, 7 note C_, 4 - musice6 23 + volume 23 note C_, 4 - musice6 128 + volume 128 note C#, 4 - musice6 23 + volume 23 note C#, 3 - musice6 128 + volume 128 note D_, 4 - musice6 23 + volume 23 note D_, 4 - musice6 128 + volume 128 note E_, 7 note D#, 4 - musice6 23 + volume 23 note D#, 4 - musice6 128 + volume 128 note E_, 4 - musice6 23 + volume 23 note E_, 3 - musice6 128 + volume 128 note F#, 4 - musice6 23 + volume 23 note F#, 4 - musice6 128 + volume 128 note G#, 4 - musice6 23 + volume 23 note G#, 3 - musice6 128 + volume 128 note A_, 8 note B_, 7 - musicd7 + inc_octave note C#, 4 note D_, 4 MainLoop - musice6 112 - Speed 1 - musicdx 5 + volume 112 + speed 1 + octave 5 Loop 8 note E_, 4 note F#, 3 note E_, 4 note F#, 4 EndLoop - musice5 64 - musice6 128 - musicd8 - musicd8 - musicd8 + duty 1 + volume 128 + dec_octave + dec_octave + dec_octave note B_, 7 - musice6 39 + volume 39 note B_, 8 - musicd8 - musice6 128 + dec_octave + volume 128 note B_, 7 note B_, 8 note B_, 7 - musice6 39 + volume 39 note B_, 8 - musice6 128 + volume 128 note B_, 7 - musice6 39 + volume 39 note B_, 8 - musice6 128 + volume 128 note B_, 7 - musice6 39 + volume 39 note B_, 8 - musice6 128 + volume 128 note B_, 15 - musicd7 + inc_octave note D_, 15 note E_, 15 - musicd7 - musice5 0 - musice6 160 + inc_octave + duty 0 + volume 160 music_call Branch_f9848 - musice6 160 + volume 160 note D_, 8 - Speed 10 + speed 10 note C#, 6 - musicd9 + no_fade note C#, 6 - musice6 55 - Speed 1 + volume 55 + speed 1 note C#, 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note C#, 7 - musice6 39 + volume 39 note C#, 8 rest 15 - musice6 128 + volume 128 note C#, 7 - musice6 39 + volume 39 note C#, 8 rest 15 - musice6 128 + volume 128 note D_, 7 - musice6 39 + volume 39 note D_, 8 rest 15 - musice6 128 + volume 128 note D_, 7 - musice6 39 + volume 39 note D_, 8 - musice5 0 - musice6 160 + duty 0 + volume 160 music_call Branch_f9848 - musice6 160 + volume 160 note C#, 8 - musicd8 - Speed 10 + dec_octave + speed 10 note A_, 6 - musicd9 + no_fade note A_, 6 - musice6 55 - Speed 1 + volume 55 + speed 1 note A_, 15 - musice5 64 - musice6 128 - musicd7 + duty 1 + volume 128 + inc_octave note C#, 7 - musice6 39 + volume 39 note C#, 8 rest 15 - musice6 128 + volume 128 note C#, 7 - musice6 39 + volume 39 note C#, 8 rest 15 - musice6 128 + volume 128 note C#, 15 note D_, 15 note E_, 15 - musice6 39 + volume 39 note E_, 15 - musice5 0 - musice6 160 + duty 0 + volume 160 note F#, 7 note F_, 7 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note F#, 7 note F_, 8 note F#, 7 note G#, 7 - musice6 55 + volume 55 note G#, 1 - musice6 160 - Speed 10 + volume 160 + speed 10 note A_, 3 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 15 - musicd8 - musice5 64 - musice6 128 + dec_octave + duty 1 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 - musice5 0 - musice6 160 + duty 0 + volume 160 rest 15 - musicd7 + inc_octave note E_, 7 note D#, 7 - musice6 55 + volume 55 note D#, 1 - musice6 160 + volume 160 note E_, 7 note D#, 8 note E_, 7 note G#, 7 - musice6 55 + volume 55 note G#, 1 - musice6 160 - Speed 9 + volume 160 + speed 9 note A_, 5 - Speed 1 - musicd8 - musice5 64 - musice6 128 + speed 1 + dec_octave + duty 1 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 - musice5 0 - musice6 160 + duty 0 + volume 160 rest 15 - musicd7 + inc_octave note D_, 7 note C#, 8 note D_, 7 - musice6 55 + volume 55 note D_, 8 - musice6 160 + volume 160 note A_, 7 - musice6 55 + volume 55 note A_, 8 - musice6 160 + volume 160 note G#, 15 - musicd9 + no_fade note G#, 7 - musice6 55 + volume 55 note G#, 8 - musice6 160 + volume 160 note F#, 15 - musice6 55 + volume 55 note F#, 7 - musice6 160 + volume 160 note G#, 8 - Speed 10 + speed 10 note E_, 6 - Speed 1 - musice6 55 + speed 1 + volume 55 note E_, 15 - musice6 160 + volume 160 note C#, 15 note D_, 15 note E_, 15 - musice6 55 + volume 55 note E_, 15 - musice6 160 + volume 160 note F#, 7 note F_, 7 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note F#, 7 note F_, 8 note F#, 6 - musice6 55 + volume 55 note F#, 1 - musice6 160 + volume 160 note G#, 6 - musice6 55 + volume 55 note G#, 2 - musice6 160 - Speed 10 + volume 160 + speed 10 note A_, 3 - Speed 1 + speed 1 note G#, 15 - musicd8 - musice5 64 - musice6 128 + dec_octave + duty 1 + volume 128 note B_, 7 - musicd7 - musice5 0 - musice6 160 + inc_octave + duty 0 + volume 160 note F#, 6 - musice6 55 + volume 55 note F#, 2 - musice6 160 + volume 160 note E_, 15 - musice6 55 + volume 55 note E_, 15 - musice6 160 + volume 160 note B_, 15 - musice5 64 - musice6 128 - musicd8 + duty 1 + volume 128 + dec_octave note B_, 7 - musicd7 - musice5 0 - musice6 160 + inc_octave + duty 0 + volume 160 note G#, 6 - musice6 55 + volume 55 note G#, 2 - musice6 160 - Speed 10 + volume 160 + speed 10 note A_, 3 - Speed 1 - musice6 55 + speed 1 + volume 55 note A_, 15 - musice6 160 + volume 160 note B_, 6 - musice6 55 + volume 55 note B_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note C#, 6 - musice6 55 + volume 55 note C#, 2 - musice6 160 - Speed 10 + volume 160 + speed 10 note D_, 3 - Speed 1 - musice6 55 + speed 1 + volume 55 note D_, 15 - musicd8 - musice6 160 + dec_octave + volume 160 note F#, 6 - musice6 55 + volume 55 note F#, 1 - musice6 160 + volume 160 note B_, 6 - musice6 55 + volume 55 note B_, 2 - musice6 160 + volume 160 note A_, 15 - musice6 55 + volume 55 note A_, 15 - musice6 160 + volume 160 note G#, 11 - musice6 55 + volume 55 note G#, 4 rest 7 - musice6 160 + volume 160 note A_, 7 - musice6 55 + volume 55 note A_, 1 - musice6 160 - Speed 10 + volume 160 + speed 10 note A_, 6 - musice5 128 - musice6 112 - Speed 1 - musicd7 + duty 2 + volume 112 + speed 1 + inc_octave note C#, 7 note C_, 8 note C#, 7 @@ -350,449 +350,449 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note G#, 5 note A_, 4 note B_, 4 - musicd7 + inc_octave note C#, 4 note D_, 3 EndMainLoop Branch_f9848: note C#, 15 - musice6 55 + volume 55 note C#, 15 - musice6 160 + volume 160 note E_, 15 - musice6 55 + volume 55 note E_, 7 - musice6 160 + volume 160 note C#, 8 note D_, 15 - musice6 55 + volume 55 note D_, 15 - musice6 160 + volume 160 note F#, 15 - musice6 55 + volume 55 note F#, 7 - musice6 160 + volume 160 note D_, 8 note E_, 7 - musice6 55 + volume 55 note E_, 8 - musice6 160 + volume 160 note A_, 15 note G#, 7 - musice6 55 + volume 55 note G#, 8 - musice6 160 + volume 160 note F#, 7 - musice6 55 + volume 55 note F#, 8 - musice6 160 + volume 160 note E_, 15 note D_, 7 - musice6 55 + volume 55 note D_, 8 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 15 - musice6 55 + volume 55 note B_, 7 - musicd7 + inc_octave music_ret Music_ChallengeHall_Ch2: ; f9883 (3e:5883) musicdc 17 - musicea 8 - musiceb 15 + vibrato_rate 8 + vibrato_delay 15 musice8 7 - musicdx 3 - Speed 10 + octave 3 + speed 10 Loop 2 rest 6 EndLoop MainLoop - musice5 64 - musice6 144 + duty 1 + volume 144 musice8 8 - Speed 10 + speed 10 note E_, 6 - musicd9 + no_fade note E_, 6 - Speed 1 + speed 1 note E_, 7 - musice6 39 + volume 39 note E_, 8 - musicd8 - musice6 128 + dec_octave + volume 128 note E_, 7 note E_, 8 note E_, 7 - musice6 39 + volume 39 note E_, 8 - musice6 128 + volume 128 note E_, 7 - musice6 39 + volume 39 note E_, 8 - musice6 128 + volume 128 note E_, 7 - musice6 39 + volume 39 note E_, 8 - musice6 128 + volume 128 note E_, 15 note F#, 15 note G#, 15 music_call Branch_f9a28 note B_, 8 - Speed 10 + speed 10 note A_, 6 - musicd9 + no_fade note A_, 6 - Speed 1 + speed 1 rest 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 rest 15 - musice6 128 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 rest 15 - musice6 128 + volume 128 note B_, 7 - musice6 39 + volume 39 note B_, 8 rest 15 - musice6 128 + volume 128 note B_, 7 - musice6 39 + volume 39 note B_, 8 music_call Branch_f9a28 note G#, 8 - Speed 10 + speed 10 note E_, 6 - musicd9 + no_fade note E_, 6 - Speed 1 + speed 1 rest 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 rest 15 - musice6 128 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 rest 15 - musice6 128 + volume 128 note A_, 15 note B_, 15 - musicd7 + inc_octave note C#, 15 - musice6 39 + volume 39 note C#, 15 - musice6 128 + volume 128 note D_, 7 - musice6 39 + volume 39 note D_, 8 rest 15 - musicd8 - musice6 128 + dec_octave + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 rest 15 - musicd7 - musice6 128 + inc_octave + volume 128 note D_, 7 - musice5 128 - musice6 96 - musicd7 + duty 2 + volume 96 + inc_octave note D_, 8 note A_, 7 - musice6 39 + volume 39 note A_, 8 - musicd7 - musice6 96 + inc_octave + volume 96 note D_, 7 - musice6 39 + volume 39 note D_, 8 - musice6 96 + volume 96 Loop 4 note E_, 4 note F#, 3 note E_, 4 note F#, 4 EndLoop - musice6 39 + volume 39 note F#, 5 rest 10 - musicd8 - musicd8 - musice5 64 - musice6 128 + dec_octave + dec_octave + duty 1 + volume 128 note C#, 7 - musicd7 - musice5 128 - musice6 96 + inc_octave + duty 2 + volume 96 note E_, 8 note A_, 7 - musice6 39 + volume 39 note A_, 8 - musicd7 - musice6 96 + inc_octave + volume 96 note C#, 7 - musice6 39 + volume 39 note C#, 8 - musice6 80 + volume 80 Loop 4 note D_, 4 note E_, 3 note D_, 4 note E_, 4 EndLoop - musicd8 + dec_octave note B_, 15 - musicd7 + inc_octave note D_, 7 - musice6 39 + volume 39 note D_, 8 - musice6 80 + volume 80 note C#, 15 - musice5 64 - musice6 128 - musicdx 2 + duty 1 + volume 128 + octave 2 note B_, 7 - musicd7 - musicd7 - musicea 1 - musice5 128 - musice6 80 + inc_octave + inc_octave + vibrato_rate 1 + duty 2 + volume 80 note B_, 8 - musicd7 - Speed 10 + inc_octave + speed 10 note C#, 6 - musice6 39 - Speed 1 + volume 39 + speed 1 note C#, 15 - musicea 8 - musice5 0 - musice6 112 - musicdx 2 + vibrato_rate 8 + duty 0 + volume 112 + octave 2 note E_, 15 note F#, 15 note A#, 15 rest 15 - musice5 64 - musice6 128 - musicd7 + duty 1 + volume 128 + inc_octave note D_, 7 - musice6 39 + volume 39 note D_, 8 rest 15 - musicd8 - musice6 128 + dec_octave + volume 128 note B_, 7 - musice6 39 + volume 39 note B_, 8 rest 15 - musicd7 - musice6 128 + inc_octave + volume 128 note D_, 7 - musicd7 - musice5 128 - musice6 96 + inc_octave + duty 2 + volume 96 note D_, 8 note A_, 7 - musice6 39 + volume 39 note A_, 8 - musicd7 - musice6 96 + inc_octave + volume 96 note D_, 7 - musice6 39 + volume 39 note D_, 8 - musice6 96 + volume 96 Loop 2 note E_, 4 note F#, 3 note E_, 4 note F#, 4 EndLoop - musice5 0 - musice6 112 - musicd8 - musicd8 + duty 0 + volume 112 + dec_octave + dec_octave note F_, 15 rest 7 note F_, 6 rest 2 - Speed 10 + speed 10 note F#, 3 - Speed 1 + speed 1 rest 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note C#, 7 - musice5 0 - musice6 112 + duty 0 + volume 112 note E_, 6 rest 2 - Speed 10 + speed 10 note F#, 3 - Speed 1 + speed 1 rest 15 - musicd8 - musice5 64 - musice6 128 + dec_octave + duty 1 + volume 128 note B_, 7 - musicd7 - musice5 0 - musice6 112 + inc_octave + duty 0 + volume 112 note D_, 6 rest 2 note E_, 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note E_, 7 - musice6 39 + volume 39 note E_, 8 - musice5 0 - musice6 112 + duty 0 + volume 112 note D_, 11 rest 4 - musice5 64 - musice6 128 - musicd8 + duty 1 + volume 128 + dec_octave note B_, 7 - musicd7 - musice5 0 - musice6 112 + inc_octave + duty 0 + volume 112 note D_, 6 rest 2 note C#, 15 - musice5 64 - musice6 128 + duty 1 + volume 128 musice8 7 note C#, 5 note C#, 5 note C#, 5 musice8 8 note C#, 7 - musice6 39 + volume 39 note C#, 8 - musice6 128 + volume 128 note C#, 7 - musice6 39 + volume 39 note C#, 8 - musice5 0 - musice6 160 + duty 0 + volume 160 note A_, 7 - musice6 55 + volume 55 note A_, 8 rest 15 - Speed 10 + speed 10 rest 3 EndMainLoop Branch_f9a28: - musice5 0 - musice6 112 + duty 0 + volume 112 note A_, 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note A_, 7 - musice6 39 + volume 39 note A_, 8 - musice5 0 - musice6 112 - musicd7 + duty 0 + volume 112 + inc_octave note C#, 15 - musicd8 - musice5 64 - musice6 128 + dec_octave + duty 1 + volume 128 note A_, 7 - musice5 0 - musice6 112 + duty 0 + volume 112 note A_, 8 note B_, 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note B_, 7 - musice6 39 + volume 39 note B_, 8 - musice5 0 - musice6 112 - musicd7 + duty 0 + volume 112 + inc_octave note D_, 15 - musicd8 - musice5 64 - musice6 128 + dec_octave + duty 1 + volume 128 note B_, 7 - musice5 0 - musice6 112 + duty 0 + volume 112 note B_, 8 - musicd7 + inc_octave note C#, 7 - musice6 55 + volume 55 note C#, 8 - musice5 64 - musice6 128 + duty 1 + volume 128 note C#, 7 - musice6 39 + volume 39 note C#, 8 - musice5 0 - musice6 112 + duty 0 + volume 112 note E_, 7 rest 8 note E_, 7 rest 8 - musice6 112 + volume 112 note D_, 15 - musice5 64 - musice6 128 + duty 1 + volume 128 note D_, 7 - musice6 39 + volume 39 note D_, 8 - musicd8 - musice5 0 - musice6 112 + dec_octave + duty 0 + volume 112 note G#, 15 - musicd7 - musice5 64 - musice6 128 + inc_octave + duty 1 + volume 128 note D_, 7 - musicd8 - musice5 0 - musice6 112 + dec_octave + duty 0 + volume 112 music_ret Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 0 musice8 8 musice8 8 - Speed 10 + speed 10 Loop 2 rest 6 EndLoop MainLoop - musicdx 1 + octave 1 musice8 8 note E_, 6 - musicd9 + no_fade note E_, 6 - Speed 1 - musicd7 + speed 1 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave musice8 7 note E_, 7 note E_, 8 @@ -814,155 +814,155 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) music_call Branch_f9b92 music_call Branch_f9b7d note A_, 15 - musicd7 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave note A_, 7 rest 8 note A_, 15 note B_, 15 - musicd7 + inc_octave note C#, 15 - musicd8 + dec_octave Loop 2 note D_, 15 - musicd7 + inc_octave note A_, 7 rest 8 - musicd8 + dec_octave note A_, 15 - musicd7 + inc_octave note F#, 7 rest 8 - musicd8 + dec_octave EndLoop note C#, 15 - musicd7 + inc_octave note A_, 7 rest 8 - musicd8 + dec_octave note A_, 15 - musicd7 + inc_octave note A_, 7 rest 8 - musicd8 + dec_octave note C#, 15 - musicd7 + inc_octave note A_, 7 rest 8 - musicd8 + dec_octave note A_, 15 - musicd7 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave note B_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note F#, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note G#, 15 - musicd7 + inc_octave note G#, 7 rest 8 - musicd8 + dec_octave note A_, 15 - musicd7 - musicd7 + inc_octave + inc_octave note C#, 7 rest 8 - musicd8 - musicd8 + dec_octave + dec_octave note G_, 15 - musicd7 - musicd7 + inc_octave + inc_octave note C#, 7 rest 8 - musicd8 - musicd8 + dec_octave + dec_octave note F#, 7 rest 8 note F#, 15 note G#, 15 note A#, 15 note B_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note C#, 15 - musicd7 + inc_octave note F#, 7 rest 8 - musicd8 + dec_octave note D_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note D#, 15 - musicd7 + inc_octave note F#, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave note F_, 15 - musicd7 + inc_octave note G#, 7 rest 8 - musicd8 + dec_octave note F#, 15 - musicd7 - musicd7 + inc_octave + inc_octave note C#, 7 rest 8 - musicd8 - musicd8 + dec_octave + dec_octave note C#, 15 - musicd7 + inc_octave note A_, 7 rest 8 - musicd8 + dec_octave note B_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note F#, 15 - musicd7 + inc_octave note F#, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note G#, 15 - musicd7 + inc_octave note G#, 7 rest 8 - musicd8 + dec_octave note A_, 7 rest 8 musice8 7 @@ -977,67 +977,67 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) note A_, 7 rest 8 rest 15 - Speed 10 + speed 10 rest 3 EndMainLoop Branch_f9b7d: note A_, 15 - musicd7 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note E_, 7 rest 8 - musicd8 + dec_octave note A_, 15 - musicd7 + inc_octave note F#, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note F#, 7 rest 8 - musicd8 + dec_octave music_ret Branch_f9b92: note A_, 15 - musicd7 + inc_octave note A_, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 - musicd7 + inc_octave + inc_octave note C#, 7 rest 8 - musicd8 - musicd8 + dec_octave + dec_octave note A_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave note E_, 15 - musicd7 + inc_octave note B_, 7 rest 8 - musicd8 + dec_octave music_ret Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) - Speed 1 - Speed 10 + speed 1 + speed 10 Loop 2 rest 6 EndLoop MainLoop - Speed 1 + speed 1 note snare1, 4 note snare2, 3 note snare2, 4 @@ -1080,7 +1080,7 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) note snare2, 4 note snare1, 15 note snare1, 15 - Speed 10 + speed 10 note snare1, 3 rest 3 EndMainLoop diff --git a/music/club1.asm b/music/club1.asm index 7965c27..d5fea0b 100644 --- a/music/club1.asm +++ b/music/club1.asm @@ -1,336 +1,336 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) - Speed 5 + speed 5 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 8 - musicdx 3 - musice5 0 - musice6 146 + octave 3 + duty 0 + volume 146 musice8 8 note C#, 2 - musicd8 + dec_octave note A_, 2 - musicd7 + inc_octave note C#, 2 note A_, 2 - musice5 128 - musice6 112 - musicd7 - Speed 1 + duty 2 + volume 112 + inc_octave + speed 1 note C#, 8 - musice6 39 + volume 39 note C#, 2 - musice6 90 + volume 90 note A_, 4 - musice6 112 + volume 112 note A_, 4 - musice6 39 + volume 39 note A_, 2 - musicd8 - musice5 0 - musice6 146 - Speed 5 + dec_octave + duty 0 + volume 146 + speed 5 note C#, 2 - musicd8 + dec_octave note A#, 2 - musicd7 + inc_octave note C#, 2 note A#, 2 - musice5 128 - musice6 112 - musicd7 - Speed 1 + duty 2 + volume 112 + inc_octave + speed 1 note C#, 8 - musice6 39 + volume 39 note C#, 2 - Speed 5 - musice6 128 - musicd8 + speed 5 + volume 128 + dec_octave note B_, 1 - musicd7 + inc_octave note C_, 1 - musicea 1 - musiceb 10 + vibrato_rate 1 + vibrato_delay 10 note C#, 4 - musicd8 - musicea 8 - musiceb 20 + dec_octave + vibrato_rate 8 + vibrato_delay 20 note A_, 2 - musicd7 + inc_octave note C#, 4 - musicd8 + dec_octave note B_, 2 - musice6 39 + volume 39 note B_, 2 rest 2 - musice5 0 - musice6 148 + duty 0 + volume 148 musice8 8 note E_, 6 rest 2 MainLoop - musice5 0 - musice6 160 - musicdx 3 + duty 0 + volume 160 + octave 3 rest 6 note A_, 4 note E_, 2 note A_, 4 note B_, 2 - musicd7 + inc_octave note C_, 4 note C#, 8 - musice6 71 + volume 71 note C#, 4 - musice6 160 + volume 160 note C#, 2 note D_, 4 note E_, 2 - musice6 71 + volume 71 note E_, 2 rest 2 - musice6 160 + volume 160 note D#, 1 note E_, 7 note D_, 6 - musicd8 + dec_octave note A_, 4 note F#, 2 - musice6 71 + volume 71 note F#, 2 rest 2 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 1 note C#, 3 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C#, 2 note C_, 4 - musicd8 + dec_octave note B_, 6 - musice6 147 + volume 147 note D_, 4 rest 2 - musicd8 + dec_octave note A_, 2 - musicea 1 - musice5 128 - musice6 80 - musicd7 - musicd7 - musicd7 + vibrato_rate 1 + duty 2 + volume 80 + inc_octave + inc_octave + inc_octave note C_, 1 note C#, 5 - musicd8 - musicd8 - musicea 8 - musice5 0 - musice6 160 + dec_octave + dec_octave + vibrato_rate 8 + duty 0 + volume 160 note A_, 4 note E_, 2 note A_, 4 note B_, 2 - musicd7 + inc_octave note C_, 4 note C#, 6 - musicd8 - musicd8 - musice6 147 + dec_octave + dec_octave + volume 147 note A#, 1 rest 5 - musicd7 - musicd7 - musice6 160 + inc_octave + inc_octave + volume 160 note C#, 2 note D_, 4 note E_, 2 - musice6 71 + volume 71 note E_, 2 rest 2 - musice6 160 + volume 160 note D#, 1 note E_, 7 note D_, 6 - musicd8 + dec_octave note A_, 4 note F#, 2 - musice6 71 + volume 71 note F#, 2 rest 2 - musice6 160 - musicd7 + volume 160 + inc_octave note C_, 1 note C#, 3 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C#, 2 note C_, 4 - musicd8 + dec_octave note B_, 8 - musice6 71 + volume 71 note B_, 4 - musice6 160 + volume 160 note E_, 2 note F_, 1 note F#, 5 note A_, 6 note B_, 4 note A_, 2 - musice6 71 + volume 71 note A_, 2 rest 2 - musice6 160 + volume 160 note E_, 1 note F_, 7 note A_, 6 note B_, 4 note A_, 2 - musice6 71 + volume 71 note A_, 2 rest 2 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 1 note C#, 5 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C#, 4 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C#, 4 note C_, 2 note C#, 4 - musicd8 + dec_octave note F#, 2 - musice6 71 + volume 71 note F#, 2 rest 2 - musicd7 - musice6 160 + inc_octave + volume 160 note D#, 1 note E_, 5 note D_, 6 note C#, 4 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C_, 1 note C#, 7 - musicd8 + dec_octave note A_, 4 note F#, 2 note A_, 4 note F#, 2 - musice6 71 + volume 71 note F#, 2 rest 2 - musice6 160 - musicd7 + volume 160 + inc_octave note C_, 1 note C#, 5 note D_, 1 note C#, 1 - musicd8 + dec_octave note A_, 4 note F#, 2 note A_, 4 note F#, 2 - musice6 71 + volume 71 note F#, 2 rest 2 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 1 note C#, 5 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C#, 4 - musice6 71 + volume 71 note C#, 2 - musice6 160 + volume 160 note C#, 4 - musicd8 + dec_octave note A_, 2 - musicd7 + inc_octave note C#, 4 - musicd8 + dec_octave note B_, 14 - musice5 128 - musice6 96 + duty 2 + volume 96 note G#, 2 note B_, 1 - musice6 55 + volume 55 note B_, 1 - musicd7 - musice6 96 + inc_octave + volume 96 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 96 + volume 96 note G#, 1 - musice6 55 + volume 55 note G#, 1 - musice6 96 + volume 96 note B_, 1 - musice6 55 + volume 55 note B_, 1 - musicd7 - musice6 96 + inc_octave + volume 96 note E_, 1 - musice6 55 + volume 55 note E_, 1 EndMainLoop Music_Club1_Ch2: ; f9d5f (3e:5d5f) - Speed 5 + speed 5 musicdc 17 - musicea 8 - musiceb 20 + vibrato_rate 8 + vibrato_delay 20 musice8 7 - musicdx 2 - musice5 0 - musice6 146 + octave 2 + duty 0 + volume 146 musice8 8 note A_, 2 note E_, 2 note A_, 2 - musicd7 + inc_octave note C#, 2 - musice5 128 - musice6 80 - Speed 1 + duty 2 + volume 80 + speed 1 note A_, 8 rest 2 - musicd7 + inc_octave note C#, 8 rest 2 - Speed 5 - musice5 0 - musice6 146 - musicd8 - musicd8 + speed 5 + duty 0 + volume 146 + dec_octave + dec_octave note A#, 2 note E_, 2 note A#, 2 - musicd7 + inc_octave note C#, 2 - musice5 128 - musice6 80 - Speed 1 + duty 2 + volume 80 + speed 1 note A#, 8 rest 2 - musicd8 - Speed 5 - musice5 0 - musice6 146 + dec_octave + speed 5 + duty 0 + volume 146 note G_, 1 note G#, 1 note A_, 2 @@ -340,48 +340,48 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note F#, 2 note G#, 3 rest 3 - musice6 148 + volume 148 note B_, 6 rest 2 MainLoop - musicdx 2 + octave 2 rest 4 - musicd7 - musice6 147 + inc_octave + volume 147 note C#, 5 rest 7 note C#, 4 rest 2 note C#, 2 rest 4 - musicd8 + dec_octave note A#, 2 - musice5 128 - musice6 80 - musicdx 5 + duty 2 + volume 80 + octave 5 note C#, 1 note D_, 3 note C#, 2 - musicd8 + dec_octave note A#, 4 - musicd8 - musice5 0 - musice6 147 + dec_octave + duty 0 + volume 147 note E_, 4 rest 2 - musicea 1 - musice5 128 - musice6 80 - musicdx 5 + vibrato_rate 1 + duty 2 + volume 80 + octave 5 note C_, 1 note C#, 5 - musice5 0 - musice6 147 - musicdx 3 + duty 0 + volume 147 + octave 3 note D_, 2 - musice5 128 - musice6 80 - musicd7 + duty 2 + volume 80 + inc_octave note A_, 4 note F#, 2 note E_, 4 @@ -397,47 +397,47 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note B_, 4 note A_, 2 rest 2 - musice5 0 - musice6 147 + duty 0 + volume 147 rest 2 - musicd8 + dec_octave note C#, 2 - musice6 96 + volume 96 note C#, 4 - musice6 55 + volume 55 note C#, 4 rest 2 - musice6 147 + volume 147 note C#, 2 - musicea 8 - musice6 96 + vibrato_rate 8 + volume 96 note D#, 4 note E_, 6 - musice6 55 + volume 55 note E_, 2 - musicd7 - musicd7 - musicea 1 - musice5 128 - musice6 80 + inc_octave + inc_octave + vibrato_rate 1 + duty 2 + volume 80 note C#, 1 note D_, 3 note C#, 2 - musicd8 + dec_octave note A#, 4 note F#, 2 rest 4 - musicd7 + inc_octave note C_, 1 note C#, 5 - musicd8 - musicd8 - musice5 0 - musice6 147 + dec_octave + dec_octave + duty 0 + volume 147 note D_, 2 - musice5 128 - musice6 80 - musicd7 + duty 2 + volume 80 + inc_octave note A_, 4 note F#, 2 note E_, 4 @@ -449,136 +449,136 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note E_, 2 note D#, 4 note D_, 6 - musicd8 - musice5 0 - musice6 147 + dec_octave + duty 0 + volume 147 note D_, 4 rest 2 - musicd8 + dec_octave note A_, 2 rest 4 note A_, 2 - musice5 128 - musice6 80 - musicd7 - musicd7 + duty 2 + volume 80 + inc_octave + inc_octave note F_, 1 note F#, 3 note D_, 2 note C#, 4 - musicd8 - musice5 0 - musice6 147 + dec_octave + duty 0 + volume 147 note D_, 4 rest 2 - musicd8 + dec_octave note A_, 2 rest 4 note A_, 2 - musicd7 - musicd7 - musice5 128 - musice6 80 + inc_octave + inc_octave + duty 2 + volume 80 note E_, 1 note F_, 3 note D_, 2 note C#, 4 - musicd8 - musice5 0 - musice6 147 + dec_octave + duty 0 + volume 147 note D_, 4 rest 2 - musicd8 + dec_octave note A_, 2 rest 4 note B_, 2 - musicd7 - musice5 128 - musice6 80 + inc_octave + duty 2 + volume 80 note E_, 4 note G#, 2 note B_, 4 - musicd7 + inc_octave note E_, 2 rest 4 - musicd8 - musicea 8 - musice5 0 - musice6 96 + dec_octave + vibrato_rate 8 + duty 0 + volume 96 note A#, 2 - musice6 55 + volume 55 note A#, 2 rest 2 - musicd7 - musice6 96 + inc_octave + volume 96 note C_, 1 note C#, 5 - musicd8 + dec_octave note B_, 6 note A#, 4 rest 2 note G#, 1 note A_, 5 - musice6 147 + volume 147 note D_, 2 - musice6 96 + volume 96 note F#, 4 note D_, 2 note F#, 4 - musicd8 - musice6 147 + dec_octave + volume 147 note A_, 4 rest 2 - musice6 96 - musicd7 + volume 96 + inc_octave note G#, 1 note A_, 5 - musice6 147 + volume 147 note D_, 2 - musice6 96 + volume 96 note F#, 4 note D_, 2 note F#, 4 - musicd8 - musice6 147 + dec_octave + volume 147 note A_, 4 rest 2 - musicd7 - musice6 96 + inc_octave + volume 96 note G#, 1 note A_, 5 - musice6 147 + volume 147 note D_, 2 - musice6 96 + volume 96 note A_, 4 rest 2 note A_, 4 - musicd8 - musice6 147 + dec_octave + volume 147 note A_, 2 - musicd7 - musice6 96 + inc_octave + volume 96 note A_, 4 note G#, 12 - musicd8 - musice6 147 + dec_octave + volume 147 note A_, 4 rest 2 note B_, 4 rest 2 - musicd7 + inc_octave note D_, 2 EndMainLoop Music_Club1_Ch3: ; f9ec4 (3e:5ec4) - Speed 5 + speed 5 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 96 musice8 7 - musicdx 1 + octave 1 note A_, 2 rest 2 note E_, 2 @@ -595,284 +595,284 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) musice8 7 note F#, 2 note F_, 2 - musicd7 + inc_octave musice8 4 note D_, 2 - musicd8 + dec_octave musice8 7 note E_, 2 rest 4 - musicd7 + inc_octave note E_, 6 - musicd8 + dec_octave note E_, 2 MainLoop - musicdx 1 + octave 1 note A_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note C#, 6 note E_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note F_, 4 - musicd7 + inc_octave musice8 4 note A#, 2 - musicd8 + dec_octave musice8 7 note F#, 4 - musicd7 + inc_octave musice8 4 note F#, 2 musice8 7 note C#, 6 - musicd8 + dec_octave note A#, 4 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note C#, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 7 note F#, 6 music_call Branch_fa01a - musicdx 1 + octave 1 musice8 7 note A_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note C#, 6 note E_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note F_, 4 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note C#, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 7 note F#, 4 - musicd7 + inc_octave musice8 4 note F#, 2 musice8 7 note C#, 6 - musicd8 + dec_octave note A#, 4 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note E_, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 7 note F#, 6 music_call Branch_fa01a - musicdx 1 + octave 1 musice8 7 note D_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note D_, 4 rest 2 note D_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note D_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note D_, 4 - musicd7 + inc_octave musice8 4 note F_, 2 - musicd8 + dec_octave musice8 7 note D_, 4 rest 2 note D_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note D_, 4 - musicd7 + inc_octave musice8 4 note F_, 2 - musicd8 + dec_octave musice8 7 note C#, 4 - musicd7 + inc_octave musice8 4 note E_, 2 - musicd8 + dec_octave musice8 7 note C#, 6 note E_, 4 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note E_, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 7 note F_, 6 note F#, 4 - musicd7 + inc_octave musice8 4 note A#, 2 musice8 7 note C#, 6 - musicd8 + dec_octave note A#, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note F#, 6 note B_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note F#, 6 note A_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note A#, 4 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note D_, 2 - musicd8 - musicd8 + dec_octave + dec_octave musice8 7 note B_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note F#, 6 note D_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note F#, 6 note E_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 6 note E_, 6 musice8 7 note E_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note E_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 musice8 7 note E_, 4 musice8 4 note G#, 2 - musicd8 + dec_octave musice8 7 note E_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note F#, 4 - musicd7 + inc_octave musice8 4 note G#, 2 - musicd8 + dec_octave musice8 7 note G#, 4 - musicd7 + inc_octave musice8 4 note B_, 2 musice8 7 EndMainLoop Branch_fa01a: - musicdx 1 + octave 1 note B_, 4 - musicd7 + inc_octave musice8 4 note A_, 2 - musicd8 + dec_octave musice8 7 note C#, 6 note D_, 4 - musicd7 + inc_octave musice8 4 note F#, 2 - musicd8 + dec_octave musice8 7 note D#, 6 note E_, 4 - musicd7 + inc_octave musice8 4 note B_, 2 - musicd8 + dec_octave musice8 7 note B_, 6 note G#, 4 - musicd7 + inc_octave musice8 4 note B_, 2 - musicd8 + dec_octave musice8 7 note E_, 4 - musicd7 + inc_octave musice8 4 note E_, 2 music_ret Music_Club1_Ch4: ; fa044 (3e:6044) - Speed 5 - musicdx 1 + speed 5 + octave 1 note bass, 2 rest 2 note bass, 2 diff --git a/music/club2.asm b/music/club2.asm index 44926a6..11a5e64 100644 --- a/music/club2.asm +++ b/music/club2.asm @@ -1,225 +1,225 @@ Music_Club2_Ch1: ; fa077 (3e:6077) - Speed 6 - musice5 128 + speed 6 + duty 2 musicdc 17 musice8 8 MainLoop - musicdx 4 + octave 4 Loop 8 - musice6 117 + volume 117 note G_, 4 note E_, 4 note C_, 4 - musice6 119 + volume 119 note F#, 4 - musicd9 + no_fade note F#, 16 - musice6 117 + volume 117 note G_, 4 note A_, 4 note B_, 4 - musice6 119 + volume 119 note F#, 4 - musicd9 + no_fade note F#, 16 EndLoop - musice6 117 + volume 117 note G_, 4 note D_, 4 - musicd8 + dec_octave note B_, 4 - musicd7 - musice6 119 + inc_octave + volume 119 note B_, 4 - musicd9 + no_fade note B_, 16 - musice6 117 + volume 117 note G_, 4 note D_, 4 note C_, 4 - musice6 119 + volume 119 note B_, 4 - musicd9 + no_fade note B_, 16 - musicd8 - musice6 117 + dec_octave + volume 117 note F#, 4 - musicd8 + dec_octave note D_, 4 note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 - musicd8 + dec_octave note C_, 4 - musicd8 + dec_octave note C_, 4 note E_, 4 note G_, 4 - musicd7 + inc_octave note C_, 4 note E_, 4 note G_, 4 - musicd7 + inc_octave note C_, 4 - musicd8 + dec_octave note D_, 4 - musicd8 + dec_octave note D_, 4 note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 note F#, 4 note A_, 4 note A_, 3 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 3 - musicd7 - musice6 119 + inc_octave + volume 119 rest 4 note D_, 5 - musicd9 - Speed 6 + no_fade + speed 6 note D_, 15 - musicd9 + no_fade note D_, 16 EndMainLoop Music_Club2_Ch2: ; fa0e3 (3e:60e3) - Speed 6 - musice5 128 + speed 6 + duty 2 musicdc 17 musice8 8 MainLoop - musicdx 2 + octave 2 Loop 8 - musice6 117 + volume 117 note C_, 4 note G_, 4 - musicd7 + inc_octave note G_, 4 - musicd7 - musice6 119 + inc_octave + volume 119 note D_, 4 - musicd9 + no_fade note D_, 16 - musicd8 - musicd8 - musice6 117 + dec_octave + dec_octave + volume 117 note C_, 4 note G_, 4 - musicd7 - musicd7 + inc_octave + inc_octave note C_, 4 - musice6 119 + volume 119 note D_, 4 - musicd9 + no_fade note D_, 16 - musicd8 - musicd8 + dec_octave + dec_octave EndLoop - musicd8 - musice6 117 + dec_octave + volume 117 note B_, 4 - musicd7 + inc_octave note G_, 4 - musicd7 + inc_octave note G_, 4 - musicd7 - musice6 119 + inc_octave + volume 119 note G_, 4 - musicd9 + no_fade note G_, 16 - musicd8 - musicd8 - musicd8 - musice6 117 + dec_octave + dec_octave + dec_octave + volume 117 note A_, 4 - musicd7 + inc_octave note A_, 4 - musicd7 + inc_octave note A_, 4 - musicd7 - musice6 119 + inc_octave + volume 119 note C_, 4 - musicd9 + no_fade note C_, 16 - musicd8 - musicd8 - musice6 117 + dec_octave + dec_octave + volume 117 note D_, 4 - musicdx 2 + octave 2 note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 note F#, 4 note G_, 4 - musicd8 - musicd8 + dec_octave + dec_octave note E_, 4 note G_, 4 - musicd7 + inc_octave note C_, 4 note E_, 4 note G_, 4 - musicd7 + inc_octave note C_, 4 note E_, 4 note F#, 4 - musicd8 - musicd8 + dec_octave + dec_octave note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 note F#, 4 note A_, 4 - musicd7 + inc_octave note D_, 4 note E_, 3 - musicd9 - Speed 1 + no_fade + speed 1 note E_, 3 - musicd8 - musice6 116 + dec_octave + volume 116 note A_, 8 - musicd7 - musice6 119 + inc_octave + volume 119 note F#, 7 - musicd9 - Speed 6 + no_fade + speed 6 note F#, 14 - musicd9 + no_fade note F#, 16 EndMainLoop Music_Club2_Ch3: ; fa164 (3e:6164) - Speed 6 - musice6 32 + speed 6 + volume 32 musicdc 17 - musice7 0 - musicea 4 - musiceb 35 + duty3 0 + vibrato_rate 4 + vibrato_delay 35 musice8 6 musice9 64 MainLoop - musice6 96 + volume 96 musice8 8 rest 2 - musicdx 4 + octave 4 note G_, 4 note E_, 4 note C_, 4 @@ -232,35 +232,35 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note F#, 2 rest 2 rest 14 - musice6 64 + volume 64 musice9 96 music_call Branch_fa1cf - musicdx 4 + octave 4 musice8 8 note G_, 8 music_call Branch_fa1cf musice9 64 - musice6 32 - musicdx 3 + volume 32 + octave 3 musice8 8 note G_, 8 music_call Branch_fa1f3 - musicdx 3 + octave 3 note G_, 16 - musicd9 + no_fade note G_, 12 rest 16 rest 8 musice8 8 note E_, 8 music_call Branch_fa1f3 - musicdx 3 + octave 3 note G_, 16 - musicd9 + no_fade note G_, 12 - musicd9 + no_fade note G_, 16 - musicd9 + no_fade note G_, 8 rest 4 musice8 8 @@ -268,19 +268,19 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note G_, 2 musice8 6 note F#, 16 - musicd9 + no_fade note F#, 12 rest 4 note F#, 1 - musicd9 + no_fade note G_, 15 - musicd9 + no_fade note G_, 12 rest 4 note G#, 1 - musicd9 + no_fade note A_, 15 - musicd9 + no_fade note A_, 16 rest 16 rest 16 @@ -289,61 +289,61 @@ Music_Club2_Ch3: ; fa164 (3e:6164) Branch_fa1cf: musice8 6 - musicdx 5 + octave 5 note C#, 1 - musicd9 + no_fade note D_, 15 - musicd9 + no_fade note D_, 12 musice8 8 note C_, 2 - musicd8 + dec_octave note B_, 2 musice8 6 note G_, 16 - musicd9 + no_fade note G_, 8 rest 4 musice8 8 note E_, 4 note B_, 4 - musicd7 + inc_octave note C_, 4 - musicd8 + dec_octave note B_, 4 musice8 6 note A_, 16 - musicd9 + no_fade note A_, 8 - musicd9 + no_fade note A_, 16 rest 4 music_ret Branch_fa1f3: - musicdx 4 + octave 4 note C#, 1 - musicd9 + no_fade note D_, 15 - musicd9 + no_fade note D_, 4 note E_, 4 - musicd8 + dec_octave note B_, 4 - musicd7 + inc_octave note C_, 4 musice8 6 note D_, 16 - musicd9 + no_fade note D_, 8 rest 4 musice8 8 note C_, 2 - musicd8 + dec_octave note B_, 2 - musicd7 + inc_octave note C_, 2 - musicd8 + dec_octave note B_, 2 musice8 6 music_ret diff --git a/music/club3.asm b/music/club3.asm index 69b0296..9a8f7dd 100644 --- a/music/club3.asm +++ b/music/club3.asm @@ -1,56 +1,56 @@ Music_Club3_Ch1: ; fa210 (3e:6210) - Speed 9 + speed 9 musicdc 17 - musicea 5 - musiceb 20 + vibrato_rate 5 + vibrato_delay 20 musice8 8 MainLoop - musice5 0 + duty 0 Loop 2 - musicdx 2 - musice6 144 + octave 2 + volume 144 rest 4 note G_, 2 - musice6 55 + volume 55 note G_, 1 - musicd7 - musice6 144 + inc_octave + volume 144 note C_, 1 - musice6 55 + volume 55 note C_, 2 - musicd8 - musice6 144 + dec_octave + volume 144 note A#, 6 - musicd9 + no_fade note A#, 12 - musice6 55 + volume 55 note A#, 4 rest 4 - musice6 144 + volume 144 note G_, 2 - musice6 55 + volume 55 note G_, 1 - musicd7 - musice6 144 - Speed 1 + inc_octave + volume 144 + speed 1 note C_, 5 - musicd9 + no_fade note C#, 4 - musicd9 - Speed 9 + no_fade + speed 9 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note A#, 6 - musicd9 + no_fade note A#, 12 - musice6 55 + volume 55 note A#, 4 EndLoop - musice5 64 - musice6 147 + duty 1 + volume 147 musice8 7 music_call Branch_fa330 music_call Branch_fa403 @@ -58,634 +58,634 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note F_, 1 note F#, 1 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note F_, 1 - musicd8 + dec_octave note D_, 1 note D#, 1 - musicd7 + inc_octave note G_, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 + octave 4 note C#, 1 note C_, 1 - musicdx 2 + octave 2 note G_, 1 - musicd7 + inc_octave musice8 8 - Speed 1 + speed 1 note G_, 5 - musice6 55 + volume 55 note G_, 4 - Speed 9 - musice6 128 + speed 9 + volume 128 note C#, 1 note C_, 1 - musicd8 + dec_octave note A#, 1 - musice6 147 + volume 147 musice8 7 music_call Branch_fa330 music_call Branch_fa403 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note F#, 1 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note F_, 1 - musicd8 + dec_octave note C#, 1 note D_, 1 - musicd7 + inc_octave note F#, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 + octave 4 note C#, 1 note C_, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 - musice5 128 - musice6 112 - Speed 1 + octave 4 + duty 2 + volume 112 + speed 1 musice8 8 note G_, 5 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 4 note G_, 5 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 4 - musice5 64 + duty 1 musice8 7 - Speed 9 + speed 9 music_call Branch_fa370 music_call Branch_fa403 note A#, 1 note F_, 1 note F#, 1 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note F_, 1 - musicd8 + dec_octave note D_, 1 note D#, 1 - musicd7 + inc_octave note G_, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 + octave 4 note C#, 1 note C_, 1 - musicdx 2 + octave 2 note G_, 1 - musicd7 + inc_octave musice8 8 - Speed 1 + speed 1 note G_, 5 - musice6 55 + volume 55 note G_, 4 - Speed 9 - musice6 128 + speed 9 + volume 128 note C#, 1 note C_, 1 - musicd8 + dec_octave note A#, 1 music_call Branch_fa370 music_call Branch_fa403 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note F#, 1 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note F_, 1 - musicd8 + dec_octave note C_, 1 note C#, 1 - musicd7 + inc_octave note F#, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 + octave 4 note C#, 1 note C_, 1 - musicd8 + dec_octave note A#, 1 - musicd7 - musice5 128 - Speed 1 + inc_octave + duty 2 + speed 1 musice8 8 - musice6 112 + volume 112 note G_, 5 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 4 note G_, 5 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 4 - Speed 9 + speed 9 musice8 8 EndMainLoop Branch_fa330: - musicdx 2 + octave 2 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note C#, 1 note C_, 1 - musicd8 + dec_octave note D_, 1 note A#, 1 note D_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note A#, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 note F_, 5 note F#, 4 - Speed 9 + speed 9 musice8 7 note G_, 1 - musicd7 + inc_octave note E_, 1 - musicd8 + dec_octave note F_, 1 note F#, 1 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note F_, 1 note E_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note G_, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 + octave 4 note C#, 1 note C_, 1 - musicdx 2 + octave 2 note G_, 1 note A#, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note F_, 1 note F#, 1 music_ret Branch_fa370: - musicdx 2 - musice6 147 + octave 2 + volume 147 musice8 7 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note C#, 1 note C_, 1 - musicd8 + dec_octave note D_, 1 note A#, 1 note D_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note A#, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 note F_, 5 note F#, 4 - musicdx 4 - musice5 128 - musice6 112 + octave 4 + duty 2 + volume 112 note G_, 3 - musice6 23 + volume 23 note G_, 2 - musicd7 - musice6 112 + inc_octave + volume 112 note D_, 2 - musice6 23 - musicd8 + volume 23 + dec_octave note G_, 2 - musicd7 - musice6 112 + inc_octave + volume 112 note G_, 3 - musice6 23 + volume 23 note D_, 2 - musice6 112 + volume 112 note D_, 2 - musice6 23 + volume 23 note G_, 2 - musicd8 - musice6 112 + dec_octave + volume 112 note G_, 3 - musice6 23 - musicd7 + volume 23 + inc_octave note D_, 2 - musice6 112 + volume 112 note D_, 2 - musice6 23 - musicd8 + volume 23 + dec_octave note G_, 2 - musicd7 - musice6 112 + inc_octave + volume 112 note G_, 3 - musice6 23 + volume 23 note D_, 2 - musice6 112 + volume 112 note D_, 2 - musice6 23 + volume 23 note G_, 2 - Speed 9 - musice5 64 + speed 9 + duty 1 musice8 7 - musice6 147 - musicdx 2 + volume 147 + octave 2 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note F_, 1 note E_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note G_, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 4 + octave 4 note C#, 1 note C_, 1 - musicdx 2 + octave 2 note G_, 1 - musicdx 5 - musice5 128 - Speed 1 + octave 5 + duty 2 + speed 1 musice8 8 - musice6 112 - musicdx 5 + volume 112 + octave 5 note G_, 5 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 4 note G_, 5 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 4 - Speed 9 - musice5 64 + speed 9 + duty 1 musice8 7 - musice6 147 + volume 147 music_ret Branch_fa403: - musicdx 2 + octave 2 note G_, 1 - musicd7 + inc_octave note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note D_, 1 - musicd7 + inc_octave note C#, 1 note C_, 1 - musicd8 + dec_octave note D_, 1 note A#, 1 note D_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note A#, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 note F_, 5 note F#, 4 - Speed 9 + speed 9 musice8 7 note G_, 1 music_ret Music_Club3_Ch2: ; fa423 (3e:6423) - Speed 9 + speed 9 musicdc 17 - musicea 5 - musiceb 20 + vibrato_rate 5 + vibrato_delay 20 musice8 8 MainLoop - musice5 0 + duty 0 Loop 2 - musicdx 2 - musice6 112 + octave 2 + volume 112 rest 4 note D_, 2 - musice6 55 + volume 55 note D_, 1 - musice6 112 + volume 112 note F_, 1 - musice6 55 + volume 55 note F_, 2 - musice6 112 + volume 112 note E_, 6 - musicd9 + no_fade note E_, 12 - musice6 55 + volume 55 note E_, 4 rest 4 - musice6 112 + volume 112 note D_, 2 - musice6 55 + volume 55 note D_, 1 - musice6 112 - Speed 1 + volume 112 + speed 1 note F_, 5 - musicd9 + no_fade note F#, 4 - Speed 9 + speed 9 note F_, 1 - musice6 55 + volume 55 note F_, 1 - musice6 112 + volume 112 note E_, 6 - musicd9 + no_fade note E_, 12 - musice6 55 + volume 55 note E_, 4 EndLoop - musice5 64 + duty 1 Loop 2 music_call Branch_fa5a6 - Speed 9 + speed 9 rest 1 - musicd7 - musice6 128 - Speed 1 + inc_octave + volume 128 + speed 1 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 147 + speed 9 + volume 147 musice8 7 note G_, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 - musice6 128 + volume 128 note F_, 5 note F#, 4 - musicd7 - Speed 9 - musice6 147 + inc_octave + speed 9 + volume 147 musice8 7 note G_, 1 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 147 + volume 147 note F_, 1 - musice6 55 + volume 55 note F_, 2 - musicd8 - musice6 147 + dec_octave + volume 147 note D_, 1 - musicd7 - musicd7 - musice6 128 - Speed 1 + inc_octave + inc_octave + volume 128 + speed 1 note D_, 5 - musice6 55 + volume 55 note D_, 4 - musice6 147 - Speed 9 + volume 147 + speed 9 rest 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 note G_, 5 note D_, 4 - musicd8 + dec_octave note A#, 5 - musice6 55 + volume 55 note A#, 4 - musicd7 - musicd7 - musice6 147 + inc_octave + inc_octave + volume 147 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 128 + speed 9 + volume 128 rest 1 - musicd8 - Speed 1 + dec_octave + speed 1 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 147 + speed 9 + volume 147 musice8 7 note G_, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 - musice6 128 + volume 128 note F_, 5 note F#, 4 - musicd7 - Speed 9 - musice6 147 + inc_octave + speed 9 + volume 147 musice8 7 note A#, 1 - musice6 55 + volume 55 note A#, 2 - musicd7 - musice6 147 + inc_octave + volume 147 note C#, 1 - musice6 55 + volume 55 note C#, 1 - musicd8 - musice6 147 + dec_octave + volume 147 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musicd8 - Speed 1 - musice6 128 + dec_octave + speed 1 + volume 128 note A#, 5 - musice6 55 + volume 55 note C_, 4 - Speed 9 + speed 9 rest 1 - musicd8 - musice6 128 + dec_octave + volume 128 musice8 8 note A#, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 music_call Branch_fa5a6 - Speed 9 + speed 9 rest 1 - musicd7 - Speed 1 - musice6 128 + inc_octave + speed 1 + volume 128 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 147 + speed 9 + volume 147 musice8 7 note G_, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 - musice6 128 + volume 128 note F_, 5 note F#, 4 - musicd7 - Speed 9 - musice6 147 + inc_octave + speed 9 + volume 147 musice8 7 note G_, 1 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 147 + volume 147 note F_, 1 - musice6 55 + volume 55 note F_, 2 - musice6 147 + volume 147 note D_, 1 - musicd7 - musice6 128 - Speed 1 + inc_octave + volume 128 + speed 1 note G_, 5 - musice6 55 + volume 55 note G_, 4 - Speed 9 + speed 9 rest 1 - musicd8 - musicd8 - Speed 1 - musice6 128 + dec_octave + dec_octave + speed 1 + volume 128 note G_, 5 - musice6 55 + volume 55 note G_, 4 - musicd7 - musice6 128 + inc_octave + volume 128 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 + speed 9 rest 1 rest 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 147 + speed 9 + volume 147 musice8 7 note G_, 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 - musice6 128 + volume 128 note F_, 5 note F#, 4 - musicd7 - musicd7 - Speed 9 - musice6 147 + inc_octave + inc_octave + speed 9 + volume 147 musice8 7 note C#, 1 - musice6 55 + volume 55 note C#, 2 - musice6 147 + volume 147 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musicd8 - musice6 147 + dec_octave + volume 147 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 128 - Speed 1 + volume 128 + speed 1 note F_, 5 - musice6 55 + volume 55 note F_, 4 - musice6 128 - Speed 9 + volume 128 + speed 9 rest 1 - musicd8 + dec_octave musice8 8 note D_, 1 note D#, 1 @@ -694,129 +694,129 @@ Music_Club3_Ch2: ; fa423 (3e:6423) EndMainLoop Branch_fa5a6: - musicdx 3 + octave 3 rest 1 - musice6 128 - Speed 1 + volume 128 + speed 1 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 147 + speed 9 + volume 147 musice8 7 note G_, 1 - musicd8 - Speed 1 - musice6 128 + dec_octave + speed 1 + volume 128 musice8 8 note F_, 5 note F#, 4 - musicd7 - Speed 9 + inc_octave + speed 9 musice8 7 - musice6 147 + volume 147 note G_, 1 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 147 + volume 147 note F_, 1 - musice6 55 + volume 55 note F_, 2 - musice6 147 + volume 147 note E_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 musice8 8 - Speed 1 + speed 1 note D_, 5 - musice6 55 + volume 55 note D_, 4 - musice6 128 - Speed 9 + volume 128 + speed 9 rest 1 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 note G_, 5 note D_, 4 - musicd8 + dec_octave note A#, 5 - musice6 55 + volume 55 note A#, 4 - musice6 128 - musicd7 - musicd7 + volume 128 + inc_octave + inc_octave note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 + speed 9 rest 1 - musicd8 - Speed 1 - musice6 128 + dec_octave + speed 1 + volume 128 note D_, 5 - musice6 55 + volume 55 note D_, 4 - Speed 9 - musice6 147 + speed 9 + volume 147 musice8 7 note G_, 1 - musicd8 - Speed 1 - musice6 128 + dec_octave + speed 1 + volume 128 musice8 8 note F_, 5 note F#, 4 - Speed 9 - musicd7 - musice6 147 + speed 9 + inc_octave + volume 147 musice8 7 note A#, 1 - musice6 55 + volume 55 note A#, 2 - musicd7 - musice6 147 + inc_octave + volume 147 note C#, 1 - musice6 55 + volume 55 note C#, 1 - musicd8 - musice6 147 + dec_octave + volume 147 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musicd8 - musice6 147 + dec_octave + volume 147 note A#, 1 - musice6 55 + volume 55 note A#, 1 musice8 8 - musice6 128 + volume 128 note A#, 1 - musice6 55 + volume 55 note A#, 2 music_ret Music_Club3_Ch3: ; fa63e (3e:663e) - Speed 9 + speed 9 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 0 musice8 8 Loop 4 - musicdx 1 + octave 1 note G_, 1 rest 1 note G_, 14 rest 1 - musicd7 + inc_octave note F_, 1 rest 2 note G_, 1 rest 2 - musicd8 + dec_octave note G_, 1 rest 1 note E_, 3 @@ -826,245 +826,245 @@ Music_Club3_Ch3: ; fa63e (3e:663e) rest 1 EndLoop Loop 2 - musicdx 1 + octave 1 note G_, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicd7 + inc_octave note F_, 1 note G_, 1 rest 1 - musicd8 + dec_octave note G_, 1 rest 1 - musicd7 + inc_octave note G_, 1 rest 1 - musicdx 4 + octave 4 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note E_, 1 note F_, 1 - musicdx 4 + octave 4 musice8 4 note G_, 1 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicd7 + inc_octave note F_, 1 note G_, 1 rest 1 - musicd8 + dec_octave note G_, 1 rest 1 - musicd7 + inc_octave note G_, 1 rest 1 - musicd7 + inc_octave musice8 4 note F_, 1 rest 1 musice8 8 note E_, 1 - musicdx 1 + octave 1 note F_, 1 note F#, 1 note D#, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note D#, 1 - musicd7 + inc_octave note D_, 1 note D#, 1 rest 1 - musicd8 + dec_octave note D#, 1 rest 1 - musicd7 + inc_octave note D#, 1 rest 1 - musicdx 4 + octave 4 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note C_, 1 note C#, 1 - musicdx 4 + octave 4 musice8 4 note G_, 1 - musicdx 1 + octave 1 musice8 8 note D#, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note D#, 1 - musicd7 + inc_octave note D_, 1 note D#, 1 rest 1 - musicd8 + dec_octave note D#, 1 rest 1 - musicd7 + inc_octave note D#, 1 rest 1 - musicd7 + inc_octave musice8 4 note F_, 1 rest 1 - musicd8 + dec_octave musice8 8 note D_, 1 note D#, 1 note E_, 1 - musicd8 + dec_octave note C_, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note C_, 1 note A#, 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave note C_, 1 rest 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicdx 4 + octave 4 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note A_, 1 note A#, 1 - musicdx 4 + octave 4 musice8 4 note G_, 1 - musicdx 1 + octave 1 musice8 8 note C_, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note C_, 1 note A#, 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave note C_, 1 rest 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd7 + inc_octave musice8 4 note F_, 1 rest 1 musice8 8 note E_, 1 - musicdx 1 + octave 1 note A#, 1 note B_, 1 note D_, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note D_, 1 - musicd7 + inc_octave note C_, 1 note D_, 1 rest 1 - musicd8 + dec_octave note D_, 1 rest 1 - musicd7 + inc_octave note D_, 1 rest 1 - musicdx 4 + octave 4 musice8 4 note C_, 1 rest 1 - musicdx 2 + octave 2 musice8 6 note A#, 1 - musicd8 + dec_octave musice8 8 note C_, 1 note C#, 1 note D_, 1 - musicdx 3 + octave 3 musice8 4 note G_, 1 rest 1 - musicdx 1 + octave 1 musice8 8 note D_, 1 - musicd7 + inc_octave note C_, 1 note D_, 1 rest 1 - musicd8 + dec_octave note D_, 1 rest 1 note F_, 1 rest 1 - musicd7 + inc_octave musice8 4 note A#, 1 rest 1 - musicd8 + dec_octave musice8 8 note A#, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 EndLoop EndMainLoop Music_Club3_Ch4: ; fa772 (3e:6772) - Speed 9 - musicdx 1 + speed 9 + octave 1 MainLoop Loop 3 music_call Branch_fa796 @@ -1080,10 +1080,10 @@ Music_Club3_Ch4: ; fa772 (3e:6772) note snare4, 2 music_call Branch_fa796 note snare1, 1 - Speed 1 + speed 1 note snare3, 5 note snare1, 4 - Speed 9 + speed 9 note snare1, 1 note snare1, 1 EndMainLoop diff --git a/music/credits.asm b/music/credits.asm index 1102808..f8e54d0 100644 --- a/music/credits.asm +++ b/music/credits.asm @@ -1,1103 +1,1103 @@ Music_Credits_Ch1: ; fb1fe (3e:71fe) - Speed 13 + speed 13 musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 2 - musice5 64 - musice6 79 + octave 2 + duty 1 + volume 79 note F_, 1 - musice6 96 + volume 96 note F_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note F_, 6 - musice6 55 + volume 55 note F_, 7 - Speed 13 - musice6 111 + speed 13 + volume 111 note G_, 1 - musice6 112 + volume 112 note G_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note G_, 6 - musice6 71 + volume 71 note G_, 7 - Speed 13 - musice6 111 + speed 13 + volume 111 note A_, 1 - musice6 128 + volume 128 note A_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 6 - musice6 71 + volume 71 note A_, 7 - Speed 13 - musice6 128 + speed 13 + volume 128 note B_, 3 - musice6 71 + volume 71 note B_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 1 - musice6 55 + volume 55 note C_, 1 music_call Branch_fb5bc - musicdx 2 + octave 2 note F_, 1 - musice6 55 + volume 55 note F_, 1 music_call Branch_fb36b - musicdx 4 - musice6 160 - Speed 1 + octave 4 + volume 160 + speed 1 note D#, 3 note E_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note E_, 4 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note F_, 1 - Speed 1 + speed 1 note G_, 5 - musice6 55 + volume 55 note G_, 8 - Speed 13 - musice6 160 + speed 13 + volume 160 note E_, 5 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note F_, 1 - Speed 1 + speed 1 note G_, 5 - musice6 55 + volume 55 note G_, 8 - Speed 13 - musice6 160 + speed 13 + volume 160 note C_, 5 - musice6 55 + volume 55 note C_, 1 - musicd8 - Speed 1 - musice6 160 + dec_octave + speed 1 + volume 160 note A_, 6 - musice6 55 + volume 55 note A_, 13 rest 7 - musicd7 - musice6 160 + inc_octave + volume 160 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 2 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note G#, 1 - musice6 55 + volume 55 note G#, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note F#, 3 note G_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 3 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note G_, 1 - Speed 1 + speed 1 note A_, 5 - musice6 55 + volume 55 note A_, 8 - musice6 160 + volume 160 note B_, 5 - musice6 55 + volume 55 note B_, 8 - musice6 160 + volume 160 note B_, 3 - musicd7 + inc_octave note C_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note C_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note C_, 6 - musice6 55 + volume 55 note C_, 13 rest 7 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 3 - musicd7 + inc_octave note C_, 10 note D_, 5 - musice6 55 + volume 55 note D_, 8 - musice6 160 + volume 160 note E_, 5 - musice6 55 + volume 55 note E_, 8 - Speed 13 - musice6 160 + speed 13 + volume 160 note F_, 3 note E_, 1 - Speed 1 + speed 1 note C_, 6 - musice6 55 + volume 55 note C_, 13 rest 7 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 6 - musice6 55 + volume 55 note A_, 13 rest 7 - musice6 160 + volume 160 note B_, 3 - musicd7 + inc_octave note C_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note C_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note C_, 6 - musice6 55 + volume 55 note C_, 13 rest 7 - musice6 160 + volume 160 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 2 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note C_, 8 - musicd9 + no_fade note C_, 8 - musicd9 + no_fade note C_, 8 - musice6 55 + volume 55 note C_, 1 music_call Branch_fb36b - musicdx 4 - Speed 1 - musice6 160 + octave 4 + speed 1 + volume 160 note D_, 3 note D#, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D#, 4 - musice6 55 + volume 55 note D#, 1 - musice6 160 + volume 160 note D_, 1 - Speed 1 + speed 1 note C_, 6 - musice6 55 + volume 55 note C_, 7 - musice6 160 + volume 160 note E_, 3 note F_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note F_, 3 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note D#, 1 note F_, 1 - musice6 55 + volume 55 note F_, 1 - Speed 1 - musice6 160 + speed 1 + volume 160 note F#, 3 note G_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 4 - musicd8 - musicd8 - Speed 1 - musice6 144 + dec_octave + dec_octave + speed 1 + volume 144 note E_, 6 note A_, 7 - musicd7 + inc_octave note C_, 6 - musicd8 + dec_octave note A_, 7 note G_, 6 - musicd7 + inc_octave note C_, 7 note F_, 6 note D_, 7 - Speed 13 + speed 13 note E_, 8 - musicd9 + no_fade note E_, 1 - musice6 55 + volume 55 note E_, 2 music_end Branch_fb36b: - Speed 13 - musicdx 2 - musice6 128 + speed 13 + octave 2 + volume 128 note A_, 1 rest 1 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 128 + volume 128 note A_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 - musice6 55 + volume 55 note C_, 1 rest 1 music_call Branch_fb5bc - musicdx 2 + octave 2 note A_, 2 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 128 + volume 128 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musice6 128 + volume 128 note B_, 1 - musicd7 + inc_octave music_call Branch_fb5e4 - musicdx 4 - musice6 160 + octave 4 + volume 160 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note G_, 4 - musicd9 + no_fade note G_, 8 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note E_, 1 note F_, 1 - Speed 1 + speed 1 note G_, 6 - musice6 55 + volume 55 note G_, 7 - musice6 160 + volume 160 note F#, 3 note G_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 4 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note F_, 1 - musice6 55 + volume 55 note F_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note E_, 3 note F_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note F_, 2 note E_, 1 - musicd9 - Speed 1 + no_fade + speed 1 note E_, 6 note F_, 4 note E_, 3 note D_, 13 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 4 - musicd9 + no_fade note D_, 8 - musice6 55 + volume 55 note D_, 2 music_call Branch_fb5e4 - musicdx 4 - musice6 160 + octave 4 + volume 160 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musicd8 - musice6 160 + dec_octave + volume 160 note G_, 4 - musicd9 + no_fade note G_, 8 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note E_, 1 note F_, 1 - Speed 1 + speed 1 note G_, 6 - musice6 55 + volume 55 note G_, 7 - musice6 160 + volume 160 note G_, 3 note G#, 10 - musicd9 + no_fade note G#, 13 - musice6 55 + volume 55 note G#, 13 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note C#, 3 note D_, 10 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note F#, 3 note G_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 2 note F_, 1 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note C_, 1 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note D#, 3 note E_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note E_, 8 music_call Branch_fb60c - Speed 13 - musicdx 4 + speed 13 + octave 4 note G_, 8 - musice6 55 + volume 55 note G_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note F#, 3 note G_, 10 - musice6 55 + volume 55 note G_, 13 - musice6 160 + volume 160 note F_, 13 - musice6 55 + volume 55 note F_, 13 - musice6 160 + volume 160 note E_, 13 - musice6 55 + volume 55 note E_, 13 - musice6 160 + volume 160 note E_, 6 note F_, 7 note E_, 13 - musicd8 + dec_octave note A_, 6 - musice6 55 + volume 55 note A_, 7 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 6 - musice6 55 + volume 55 note C_, 7 - musicd8 - musice6 160 + dec_octave + volume 160 note F_, 6 - musice6 55 + volume 55 note F_, 13 rest 7 - musice6 160 + volume 160 note A_, 13 - musicd7 + inc_octave note C_, 6 - musice6 55 + volume 55 note C_, 7 - musice6 160 + volume 160 note D#, 3 note E_, 10 - musicd9 + no_fade note E_, 13 note F_, 6 - musice6 55 + volume 55 note F_, 7 - musice6 160 + volume 160 note E_, 6 - musice6 55 + volume 55 note E_, 7 - musice6 160 + volume 160 note C_, 6 - musice6 55 + volume 55 note C_, 13 rest 7 - musice6 160 + volume 160 note C#, 3 note D_, 10 - musicd9 + no_fade note D_, 13 note C#, 6 note C_, 7 - musicd8 + dec_octave note B_, 13 - musicd7 + inc_octave note C_, 6 - musice6 55 + volume 55 note C_, 7 - musice6 160 + volume 160 note G_, 6 - musice6 55 + volume 55 note G_, 7 - musice6 160 - Speed 13 + volume 160 + speed 13 note E_, 5 music_call Branch_fb60c - Speed 13 - musicdx 4 + speed 13 + octave 4 note G_, 3 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note G_, 1 - Speed 1 + speed 1 note A_, 6 - musice6 55 + volume 55 note A_, 7 - musice6 160 + volume 160 note B_, 6 - musice6 55 + volume 55 note B_, 7 - musice6 160 + volume 160 note B_, 3 - musicd7 + inc_octave note C_, 10 - musice6 55 + volume 55 note C_, 13 - musicd8 - musice6 160 + dec_octave + volume 160 note F#, 3 note G_, 10 - musice6 55 + volume 55 note G_, 13 - musice6 160 + volume 160 note F_, 13 - musice6 55 + volume 55 note F_, 13 - musice6 160 + volume 160 note E_, 13 - musice6 55 + volume 55 note E_, 13 - musice6 160 + volume 160 note E_, 3 note F_, 10 - musicd9 + no_fade note F_, 13 note E_, 13 note C_, 6 - musice6 55 + volume 55 note C_, 7 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 6 - musice6 55 + volume 55 note A_, 7 rest 13 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 13 - musicd8 + dec_octave note A_, 6 - musice6 55 + volume 55 note A_, 7 - musicd7 - musice6 160 + inc_octave + volume 160 note E_, 3 note F_, 10 - musicd9 + no_fade note F_, 13 note E_, 13 note C_, 6 - musice6 55 + volume 55 note C_, 7 - musicd8 - musice6 160 + dec_octave + volume 160 note G#, 6 - musice6 55 + volume 55 note G#, 7 rest 13 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 6 - musice6 55 + volume 55 note C_, 7 rest 13 - musice6 160 + volume 160 note F#, 3 note G_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 8 - musice6 55 + volume 55 note G_, 1 - musicd8 - musicd8 - musice6 128 + dec_octave + dec_octave + volume 128 note G_, 1 - musice6 39 + volume 39 note G_, 1 - musice6 128 + volume 128 note A_, 1 - musice6 39 + volume 39 note A_, 1 - musice6 128 + volume 128 note B_, 1 - Speed 1 - musice6 160 + speed 1 + volume 160 note G_, 3 note A_, 3 note B_, 3 - musicd7 + inc_octave note C_, 4 note D_, 3 note E_, 3 note F_, 3 note G_, 4 music_call Branch_fb651 - musicdx 3 - musice6 160 + octave 3 + volume 160 note G#, 3 note A_, 10 - musicd9 + no_fade note A_, 13 - musice6 55 + volume 55 note A_, 13 - musice6 160 + volume 160 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note C#, 3 note D_, 10 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note F#, 3 note G_, 10 - musicd9 + no_fade note G_, 13 - musice6 55 + volume 55 note G_, 13 - musice6 160 + volume 160 note D#, 3 note E_, 10 - musice6 55 + volume 55 note E_, 13 - musice6 160 + volume 160 note D_, 13 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 4 - musicd9 + no_fade note D_, 8 - musice6 55 + volume 55 note D_, 1 - musicd8 - musice6 128 + dec_octave + volume 128 note G_, 1 - Speed 1 + speed 1 note A_, 6 - musice6 39 + volume 39 note A_, 7 - musice6 128 + volume 128 note B_, 6 - musice6 39 + volume 39 note B_, 7 music_call Branch_fb651 - musicdx 3 - musice6 160 + octave 3 + volume 160 note G_, 3 note G#, 10 - musicd9 + no_fade note G#, 13 - musice6 55 + volume 55 note G#, 13 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note C#, 3 note D_, 10 note C_, 13 - musice6 55 + volume 55 note C_, 13 - musice6 160 + volume 160 note F#, 3 note G_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 2 note F_, 1 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note C_, 1 note D_, 1 - musice6 55 + volume 55 note D_, 1 music_ret Branch_fb5bc: - musicdx 2 - Speed 13 + octave 2 + speed 13 rest 2 - musice6 128 + volume 128 note G_, 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave note A_, 1 - musice6 55 + volume 55 note A_, 1 rest 2 - musice6 128 + volume 128 note B_, 1 - musice6 55 + volume 55 note B_, 1 - musice6 128 + volume 128 note A_, 1 rest 1 - musicd7 + inc_octave note C_, 1 - musice6 55 + volume 55 note C_, 1 rest 3 - musicd8 - musice6 128 + dec_octave + volume 128 note G_, 1 - musicd7 + inc_octave note C_, 1 rest 1 music_ret Branch_fb5e4: - musicdx 3 - musice6 160 - Speed 1 + octave 3 + volume 160 + speed 1 note F#, 3 note G_, 10 note F_, 6 - musice6 55 + volume 55 note F_, 7 - Speed 13 - musice6 128 + speed 13 + volume 128 note E_, 4 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musicd7 - musice6 160 - Speed 1 + inc_octave + volume 160 + speed 1 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 4 - musice6 55 + volume 55 note D_, 1 music_ret Branch_fb60c: - musicdx 4 - Speed 13 - musice6 55 + octave 4 + speed 13 + volume 55 note E_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note D#, 3 note E_, 10 - Speed 13 - musice6 55 + speed 13 + volume 55 note E_, 1 - musice6 160 + volume 160 note F_, 1 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note G#, 3 note A_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note A_, 8 - musice6 55 + volume 55 note A_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note G#, 3 note A_, 10 - musice6 55 + volume 55 note A_, 13 - musice6 160 + volume 160 note G_, 13 - musice6 55 + volume 55 note G_, 13 - musice6 160 + volume 160 note F_, 13 - musice6 55 + volume 55 note F_, 13 - musice6 160 + volume 160 note F#, 3 note G_, 10 - musicd9 + no_fade music_ret Branch_fb651: - musicdx 3 - musice6 160 + octave 3 + volume 160 note D#, 3 note E_, 10 note F_, 6 - musice6 55 + volume 55 note F_, 7 - musice6 160 + volume 160 note G_, 5 - musice6 55 + volume 55 note G_, 8 - musicd7 - musice6 160 + inc_octave + volume 160 note C#, 3 note D_, 10 - musicd9 + no_fade note D_, 13 note C_, 6 - musice6 55 + volume 55 note C_, 13 rest 7 - musicd8 - Speed 13 - musice6 160 + dec_octave + speed 13 + volume 160 note G_, 6 - musicd9 + no_fade note G_, 6 - musicd9 + no_fade note G_, 8 - musice6 55 + volume 55 note G_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note D#, 3 note E_, 10 note F_, 5 - musice6 55 + volume 55 note F_, 8 - musice6 160 + volume 160 note G_, 5 - musice6 55 + volume 55 note G_, 8 music_ret Music_Credits_Ch2: ; fb68a (3e:768a) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musice5 64 - musicdx 2 - Speed 13 - musice6 63 + duty 1 + octave 2 + speed 13 + volume 63 note A_, 1 - musice6 112 + volume 112 note A_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 6 - musice6 39 + volume 39 note A_, 7 - Speed 13 - musice6 127 + speed 13 + volume 127 note B_, 1 - musice6 128 + volume 128 note B_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note B_, 6 - musice6 55 + volume 55 note B_, 7 - musicd7 - Speed 13 - musice6 95 + inc_octave + speed 13 + volume 95 note C_, 1 - musice6 144 + volume 144 note C_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note C_, 6 - musice6 55 + volume 55 note C_, 7 - Speed 13 - musice6 144 + speed 13 + volume 144 note D_, 3 - musice6 55 + volume 55 note D_, 1 music_call Branch_fb79e - musicdx 4 - Speed 13 - musice6 128 + octave 4 + speed 13 + volume 128 note C_, 3 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 rest 2 - musicd7 - musice6 128 + inc_octave + volume 128 note D_, 1 musice8 4 note E_, 1 musice8 8 note C_, 3 - musicd8 - musice6 146 + dec_octave + volume 146 note D_, 1 rest 2 - musicd7 - musice6 128 + inc_octave + volume 128 note D_, 1 musice8 4 note E_, 1 - musicd8 + dec_octave musice8 8 note A_, 3 - musice6 146 + volume 146 note C_, 1 rest 2 musice8 4 - musice6 128 + volume 128 note F_, 1 musice8 8 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 note G#, 3 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 note G#, 1 rest 1 note F_, 1 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 note E_, 3 - musice6 146 + volume 146 note D_, 1 rest 1 - musicd8 - musice6 128 + dec_octave + volume 128 note B_, 1 - musicd7 + inc_octave musice8 4 note C_, 1 - musice6 146 + volume 146 musice8 8 note D_, 1 - musice6 128 + volume 128 note E_, 3 - musice6 146 + volume 146 note C_, 1 rest 1 - musice6 128 + volume 128 note E_, 1 musice8 4 note F_, 1 musice8 8 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 note A_, 3 - musice6 146 + volume 146 note C_, 1 musice8 4 note A_, 1 rest 1 note F_, 1 musice8 8 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 note A_, 3 - musice6 146 + volume 146 note C_, 1 rest 1 - musice6 128 + volume 128 note G#, 3 rest 1 music_call Branch_fb79e - musicdx 4 - Speed 13 - musice6 128 + octave 4 + speed 13 + volume 128 note C_, 1 - musicd9 + no_fade note C_, 2 - musicd8 - musicd8 - musice6 146 + dec_octave + dec_octave + volume 146 note G#, 1 rest 2 - musicd7 - musice6 128 + inc_octave + volume 128 note A#, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note G#, 1 - musicd7 - musicd7 - musice6 128 + inc_octave + inc_octave + volume 128 note C_, 1 - musicd9 + no_fade note C_, 2 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 rest 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 1 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note E_, 1 - musicd9 + no_fade note E_, 4 - musicd8 - musicd8 - Speed 1 - musice6 128 + dec_octave + dec_octave + speed 1 + volume 128 note C_, 6 note F_, 7 note A_, 6 note F_, 7 note E_, 6 note G_, 7 - musicd7 + inc_octave note D_, 6 - musicd8 + dec_octave note B_, 7 - musicd7 - Speed 13 + inc_octave + speed 13 note C_, 8 - musicd9 + no_fade note C_, 1 - musice6 39 + volume 39 note C_, 2 music_end Branch_fb79e: - Speed 13 - musicdx 3 - musice6 144 + speed 13 + octave 3 + volume 144 note E_, 1 - musice6 55 + volume 55 note E_, 1 music_call Branch_fba68 - musicdx 2 - musice6 144 + octave 2 + volume 144 note A_, 1 - musice6 55 + volume 55 note A_, 1 - musicd7 - musice6 144 + inc_octave + volume 144 note C_, 1 - musice6 146 + volume 146 note C_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note B_, 1 - musice6 55 + volume 55 note B_, 1 - musicd7 - musice6 144 + inc_octave + volume 144 note C_, 1 note D_, 1 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 music_call Branch_fba68 - musice6 144 - musicdx 3 - Speed 1 + volume 144 + octave 3 + speed 1 note E_, 3 note F_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note F_, 1 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 144 + volume 144 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musice6 144 + volume 144 note D_, 3 - musice6 146 - musice5 64 + volume 146 + duty 1 Loop 2 rest 2 note C_, 1 @@ -1113,9 +1113,9 @@ Branch_fb79e: rest 2 music_call Branch_fba9d rest 2 - musice5 64 - musice6 146 - musicdx 3 + duty 1 + volume 146 + octave 3 note C_, 1 rest 1 Loop 4 @@ -1124,210 +1124,210 @@ Branch_fb79e: rest 1 EndLoop rest 2 - musice5 128 - musice6 112 - Speed 1 + duty 2 + volume 112 + speed 1 note E_, 3 note F_, 10 note A_, 5 - musice6 39 + volume 39 note A_, 8 - musicd7 - musice6 112 + inc_octave + volume 112 note C_, 5 - musice6 39 + volume 39 note C_, 8 - musice6 112 + volume 112 note E_, 5 - musice6 39 + volume 39 note E_, 8 - musicd8 - musice6 146 - musice5 64 + dec_octave + volume 146 + duty 1 note C_, 13 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note E_, 3 note F_, 10 - musicd9 + no_fade note F_, 13 note E_, 5 note F_, 4 note E_, 4 - musicd8 - musice5 64 - musice6 146 + dec_octave + duty 1 + volume 146 note C_, 13 - musice5 128 - musice6 112 + duty 2 + volume 112 note A_, 5 - musice6 39 + volume 39 note A_, 8 - musicd7 - musice6 112 + inc_octave + volume 112 note C_, 5 - musice6 39 + volume 39 note C_, 8 - musice6 112 + volume 112 note C#, 3 note D_, 10 - musicd8 - musice5 64 - musice6 146 + dec_octave + duty 1 + volume 146 note C_, 13 rest 13 - musicd8 - musice6 128 + dec_octave + volume 128 note B_, 3 - musicd7 + inc_octave note C_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note C_, 3 rest 1 note E_, 1 - musice6 146 + volume 146 note C_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note A#, 3 note B_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note B_, 4 rest 1 - musicd7 + inc_octave note C_, 1 - musicd8 - musice5 64 - musice6 146 + dec_octave + duty 1 + volume 146 note D_, 1 - musice6 128 + volume 128 note E_, 5 rest 1 music_call Branch_fba9d - musice5 64 - musicdx 3 + duty 1 + octave 3 note C_, 1 note D_, 1 - musice6 146 + volume 146 note C_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note E_, 3 note F_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note F_, 1 rest 1 note F_, 1 rest 1 note G#, 1 note F_, 1 - musice6 146 + volume 146 note C_, 1 - musicd7 - musice6 128 - Speed 1 + inc_octave + volume 128 + speed 1 note D_, 3 note D#, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D#, 2 - musicd8 - musicd8 - musice6 146 + dec_octave + dec_octave + volume 146 note G#, 1 rest 1 - musicd7 - musice6 128 + inc_octave + volume 128 note G#, 1 note A#, 1 - musicd8 - musice6 147 + dec_octave + volume 147 note G#, 1 - musicd7 - musicd7 - musice6 128 + inc_octave + inc_octave + volume 128 note C_, 3 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 rest 1 - musice6 128 - Speed 1 + volume 128 + speed 1 note F#, 3 note G_, 10 - musicd7 - Speed 13 + inc_octave + speed 13 musice8 4 note C_, 1 - musicd8 + dec_octave note B_, 1 musice8 8 note A#, 1 rest 1 music_call Branch_fbacb - musicdx 3 - musice6 146 + octave 3 + volume 146 musice8 8 note D_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note B_, 3 - musicd7 + inc_octave note C_, 10 - Speed 13 + speed 13 rest 1 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 1 rest 1 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 1 note C_, 1 - musicd8 + dec_octave musice8 4 note F_, 1 musice8 8 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 musice8 4 note D_, 1 rest 1 musice8 8 note F_, 1 - musice6 146 + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 2 musice8 4 note D_, 1 - musicd8 + dec_octave musice8 8 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 musice8 4 note A_, 1 rest 1 musice8 8 note B_, 1 - musice6 146 + volume 146 note C_, 1 - musice6 128 + volume 128 musice8 4 note A_, 1 musice8 8 @@ -1335,227 +1335,227 @@ Branch_fb79e: musice8 4 note A_, 1 musice8 8 - musice6 146 + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 2 - musicd8 - Speed 1 + dec_octave + speed 1 note B_, 3 - musicd7 + inc_octave note C_, 10 - musicd8 - Speed 13 + dec_octave + speed 13 musice8 4 note B_, 1 musice8 6 note A#, 2 music_call Branch_fbacb - musicdx 4 + octave 4 note G_, 1 musice8 8 note E_, 1 - Speed 13 + speed 13 rest 1 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note C_, 1 rest 1 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 musice8 7 note C_, 2 musice8 8 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musice6 128 + volume 128 musice8 4 note F_, 1 rest 1 musice8 8 note A_, 1 - musice6 146 + volume 146 note C_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 musice8 7 note C_, 2 musice8 8 note C_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 - musice6 128 + volume 128 musice8 4 note F_, 1 rest 1 note G#, 1 musice8 8 - musice6 146 + volume 146 note C_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note B_, 3 - musicd7 + inc_octave note C_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note C_, 3 rest 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave musice8 4 note C_, 1 - musicd8 + dec_octave musice8 8 - musice6 146 + volume 146 note C_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note A#, 3 note B_, 10 rest 13 - musicd8 - musice6 144 + dec_octave + volume 144 note A#, 3 note B_, 10 - musice6 39 + volume 39 note B_, 13 - musicd7 - musice6 144 + inc_octave + volume 144 note C_, 13 - musice6 39 + volume 39 note C_, 13 - musice6 144 - Speed 13 + volume 144 + speed 13 note D_, 2 - musice6 39 + volume 39 note D_, 1 music_call Branch_fbb10 rest 1 - musicdx 2 + octave 2 note A_, 1 rest 1 note B_, 1 note A_, 1 - musicd7 - musice6 146 + inc_octave + volume 146 note C_, 1 - musice6 128 + volume 128 note E_, 2 rest 1 note C_, 1 rest 1 - musicd8 + dec_octave musice8 7 note G_, 1 musice8 8 note G_, 1 - musicd7 - musice6 146 + inc_octave + volume 146 note C_, 1 - musicd8 - Speed 1 - musice6 128 + dec_octave + speed 1 + volume 128 note E_, 3 note F_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note F_, 1 rest 1 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note F_, 13 note A_, 6 - musice6 39 + volume 39 note A_, 7 - musicd7 - musice6 112 + inc_octave + volume 112 note C_, 6 - musice6 39 + volume 39 note C_, 7 - musice6 112 + volume 112 note E_, 6 - musice6 39 + volume 39 note E_, 7 - musicd8 - musice5 64 - musice6 146 + dec_octave + duty 1 + volume 146 note C_, 13 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note D#, 3 note E_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note E_, 1 note F_, 1 - Speed 1 + speed 1 note E_, 5 - musice6 39 + volume 39 note E_, 8 - musice6 112 + volume 112 note D_, 5 - musice6 39 + volume 39 note D_, 8 - Speed 13 + speed 13 rest 1 - musicd8 - musicd8 - musice6 144 - musice5 64 + dec_octave + dec_octave + volume 144 + duty 1 note B_, 1 - musicd7 - Speed 1 + inc_octave + speed 1 note C_, 6 - musice6 39 + volume 39 note C_, 7 - musice6 144 + volume 144 note D_, 6 - musice6 39 + volume 39 note D_, 7 music_call Branch_fbb10 - musicdx 3 + octave 3 rest 1 note F_, 1 rest 1 note G#, 1 note F_, 1 - musice6 146 + volume 146 note C_, 1 - musicd7 - Speed 1 - musice6 128 + inc_octave + speed 1 + volume 128 note D_, 3 note D#, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D#, 2 - musicd8 - musicd8 - musice6 146 + dec_octave + dec_octave + volume 146 note G#, 1 rest 1 - Speed 1 + speed 1 rest 6 - musice6 144 + volume 144 note G#, 7 - musicd7 + inc_octave note C_, 6 note D#, 7 note G_, 6 @@ -1563,225 +1563,225 @@ Branch_fb79e: music_ret Branch_fba68: - musicdx 3 - musice6 146 + octave 3 + volume 146 note C_, 1 rest 1 - musice6 144 + volume 144 note C_, 1 note E_, 1 - musice6 146 + volume 146 note C_, 1 - musice6 144 + volume 144 note F_, 1 - musice6 55 + volume 55 note F_, 1 rest 1 - musice6 146 + volume 146 note C_, 1 - musice6 144 + volume 144 note G_, 1 - musice6 55 + volume 55 note G_, 1 - musice6 144 + volume 144 note F_, 1 - musice6 146 + volume 146 note C_, 1 - musice6 144 + volume 144 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 - musice6 146 + volume 146 note C_, 1 rest 1 - musice6 144 + volume 144 note C_, 1 note E_, 1 - musice6 146 + volume 146 note C_, 1 music_ret Branch_fba9d: - musicdx 4 - musice5 128 - musice6 112 - Speed 1 + octave 4 + duty 2 + volume 112 + speed 1 note F#, 3 note G_, 10 - musicd8 - musice5 64 - musice6 146 + dec_octave + duty 1 + volume 146 note C_, 13 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note E_, 5 - musice6 39 + volume 39 note E_, 8 - musice6 112 + volume 112 note E_, 3 note F_, 10 note E_, 5 - musice6 39 + volume 39 note E_, 8 - musicd8 - Speed 13 - musice5 64 - musice6 146 + dec_octave + speed 13 + duty 1 + volume 146 note C_, 1 - musice5 128 - musice6 112 + duty 2 + volume 112 note G_, 1 music_ret Branch_fbacb: - musicdx 3 + octave 3 musice8 8 Loop 3 note A#, 1 rest 1 EndLoop - musicd7 + inc_octave note C_, 3 - musicd8 - musice6 146 + dec_octave + volume 146 note C_, 1 rest 1 - musice6 128 + volume 128 note A_, 1 - musicd7 + inc_octave musice8 4 note C_, 1 - musicd8 + dec_octave musice8 8 - musice6 146 + volume 146 note C_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note A#, 3 note B_, 16 rest 7 note A#, 3 note B_, 10 - musicd8 - Speed 13 - musice6 146 + dec_octave + speed 13 + volume 146 note B_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note B_, 1 rest 1 note A_, 1 - musicd8 - musice6 146 + dec_octave + volume 146 note B_, 1 - musicd7 - musice6 128 + inc_octave + volume 128 note B_, 3 - musice6 146 + volume 146 note D_, 1 rest 1 - musice6 128 + volume 128 note B_, 1 - musicd7 + inc_octave musice8 4 note D_, 1 music_ret Branch_fbb10: - musicdx 3 - Speed 13 - musice6 128 + octave 3 + speed 13 + volume 128 note C_, 1 musice8 3 note D_, 1 - musice6 146 + volume 146 musice8 8 note C_, 1 - musice6 128 + volume 128 note B_, 2 musice8 3 note A_, 1 - musice6 147 + volume 147 musice8 8 note C_, 1 - Speed 1 - musice6 128 + speed 1 + volume 128 note D#, 3 note E_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note E_, 2 - musice6 146 + volume 146 note D_, 1 - musicd7 - musice5 128 - musice6 112 - Speed 1 + inc_octave + duty 2 + volume 112 + speed 1 note G_, 5 - musice6 39 + volume 39 note G_, 8 - musice6 112 + volume 112 note F_, 5 note G_, 4 note F_, 4 note E_, 5 - musice6 39 + volume 39 note E_, 8 - musicd8 - musice5 64 - musice6 146 + dec_octave + duty 1 + volume 146 note D_, 13 - musicd7 - musice5 128 - musice6 112 + inc_octave + duty 2 + volume 112 note C_, 5 - musice6 39 + volume 39 note C_, 8 - musice6 112 + volume 112 note D_, 13 note E_, 5 - musice6 39 + volume 39 note E_, 8 - musice6 112 + volume 112 note C_, 5 - musice6 39 + volume 39 note C_, 8 - musicd8 - Speed 13 - musice6 112 + dec_octave + speed 13 + volume 112 note E_, 4 - musicd7 - musicd7 - Speed 1 + inc_octave + inc_octave + speed 1 note C_, 5 - musice6 39 + volume 39 note C_, 8 - musicd8 - musice6 112 + dec_octave + volume 112 note B_, 13 - musicd7 + inc_octave note C_, 5 - musice6 39 + volume 39 note C_, 8 - musicd8 - musice6 112 + dec_octave + volume 112 note B_, 5 - musice6 39 + volume 39 note B_, 8 - musice6 112 + volume 112 note G_, 5 - musice6 39 + volume 39 note G_, 8 - musicd8 - musicd8 - musice5 64 - musice6 128 + dec_octave + dec_octave + duty 1 + volume 128 note B_, 3 - musicd7 + inc_octave note C_, 10 - Speed 13 + speed 13 musice8 3 note D_, 1 note E_, 1 @@ -1791,13 +1791,13 @@ Branch_fbb10: Music_Credits_Ch3: ; fbb9d (3e:7b9d) - Speed 1 + speed 1 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 96 musice8 8 - musicdx 1 + octave 1 Loop 12 note G_, 6 rest 7 @@ -1805,7 +1805,7 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) note G_, 6 note A_, 7 note B_, 6 - musicd7 + inc_octave note C_, 7 note D_, 6 note E_, 7 @@ -1813,16 +1813,16 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) note G_, 7 music_call Branch_fbc46 music_call Branch_fbd47 - musicdx 1 + octave 1 Loop 2 Loop 2 note B_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note G_, 13 - musicd8 + dec_octave musice8 8 note B_, 6 rest 7 @@ -1832,10 +1832,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) note A_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note A_, 6 rest 7 @@ -1845,10 +1845,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) note G#, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note G#, 6 rest 7 @@ -1857,36 +1857,36 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) music_call Branch_fbd6b music_call Branch_fbdb7 music_call Branch_fbe3d - musicdx 1 + octave 1 note B_, 13 music_call Branch_fbc46 - Speed 1 - musicdx 1 + speed 1 + octave 1 Loop 2 note G#, 6 rest 7 note G#, 6 rest 7 - musicd7 - musicd7 + inc_octave + inc_octave musice8 4 note D#, 13 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note G#, 6 rest 7 EndLoop - musicd7 + inc_octave Loop 2 note C#, 6 rest 7 note C#, 6 rest 7 - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note C#, 6 rest 7 @@ -1895,10 +1895,10 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 note C_, 6 rest 7 - musicd7 + inc_octave musice8 4 note C_, 13 - musicd8 + dec_octave musice8 8 note C_, 6 rest 7 @@ -1906,21 +1906,21 @@ Music_Credits_Ch3: ; fbb9d (3e:7b9d) rest 7 note C_, 6 rest 7 - musicd8 + dec_octave note G_, 6 rest 7 note G_, 6 rest 7 - Speed 13 + speed 13 note C_, 8 - musicd9 + no_fade note C_, 1 rest 2 music_end Branch_fbc46: - Speed 1 - musicdx 2 + speed 1 + octave 2 music_call Branch_fbd47 music_call Branch_fbe23 music_call Branch_fbd47 @@ -1937,16 +1937,16 @@ Branch_fbc46: note C_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note C_, 13 - musicd8 + dec_octave musice8 8 note C_, 6 rest 7 music_call Branch_fbd47 music_call Branch_fbe23 - musicdx 2 + octave 2 Loop 2 note C_, 6 rest 7 @@ -1962,14 +1962,14 @@ Branch_fbc46: EndLoop musice8 4 note G_, 13 - musicd8 + dec_octave musice8 8 note G_, 13 - musicd9 - Speed 13 + no_fade + speed 13 note G_, 7 rest 1 - Speed 1 + speed 1 music_call Branch_fbd47 music_call Branch_fbd58 music_call Branch_fbd6b @@ -2001,22 +2001,22 @@ Branch_fbc46: music_call Branch_fbdb7 music_call Branch_fbdf0 music_call Branch_fbdca - musicdx 1 + octave 1 note G_, 6 rest 7 note G_, 13 - musicd7 + inc_octave note G_, 6 rest 7 - musicd8 + dec_octave note A_, 6 rest 7 note A_, 6 rest 7 - Speed 13 + speed 13 note B_, 2 note G_, 1 - Speed 1 + speed 1 music_call Branch_fbd47 music_call Branch_fbd58 music_call Branch_fbd6b @@ -2025,7 +2025,7 @@ Branch_fbc46: music_call Branch_fbda4 music_call Branch_fbdb7 music_call Branch_fbe3d - musicdx 1 + octave 1 note B_, 6 rest 7 music_call Branch_fbd47 @@ -2033,34 +2033,34 @@ Branch_fbc46: music_call Branch_fbd6b music_call Branch_fbd7e music_call Branch_fbddd - musicdx 1 + octave 1 Loop 2 note A#, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note A#, 6 rest 7 note A#, 6 - musicd7 + inc_octave note F_, 7 note G#, 6 - musicd7 + inc_octave note C_, 7 note D#, 6 note G_, 7 - musicd8 - musicd8 + dec_octave + dec_octave note A#, 6 rest 7 music_ret Branch_fbd47: - musicdx 2 + octave 2 Loop 2 Loop 2 note C_, 6 @@ -2075,16 +2075,16 @@ Branch_fbd47: music_ret Branch_fbd58: - musicdx 1 + octave 1 Loop 2 Loop 2 note B_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note G_, 13 - musicd8 + dec_octave musice8 8 note B_, 6 rest 7 @@ -2092,16 +2092,16 @@ Branch_fbd58: music_ret Branch_fbd6b: - musicdx 1 + octave 1 Loop 2 Loop 2 note A_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note G_, 13 - musicd8 + dec_octave musice8 8 note A_, 6 rest 7 @@ -2109,16 +2109,16 @@ Branch_fbd6b: music_ret Branch_fbd7e: - musicdx 1 + octave 1 Loop 2 Loop 2 note G_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note G_, 13 - musicd8 + dec_octave musice8 8 note G_, 6 rest 7 @@ -2126,16 +2126,16 @@ Branch_fbd7e: music_ret Branch_fbd91: - musicdx 1 + octave 1 Loop 2 Loop 2 note F_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note F_, 6 rest 7 @@ -2143,16 +2143,16 @@ Branch_fbd91: music_ret Branch_fbda4: - musicdx 1 + octave 1 Loop 2 Loop 2 note E_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note E_, 13 - musicd8 + dec_octave musice8 8 note E_, 6 rest 7 @@ -2160,16 +2160,16 @@ Branch_fbda4: music_ret Branch_fbdb7: - musicdx 1 + octave 1 Loop 2 Loop 2 note D_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note D_, 6 rest 7 @@ -2177,16 +2177,16 @@ Branch_fbdb7: music_ret Branch_fbdca: - musicdx 1 + octave 1 Loop 2 Loop 2 note G_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note G_, 6 rest 7 @@ -2194,16 +2194,16 @@ Branch_fbdca: music_ret Branch_fbddd: - musicdx 1 + octave 1 Loop 2 Loop 2 note F_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note G#, 13 - musicd8 + dec_octave musice8 8 note F_, 6 rest 7 @@ -2211,16 +2211,16 @@ Branch_fbddd: music_ret Branch_fbdf0: - musicdx 1 + octave 1 Loop 2 Loop 2 note A#, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note A#, 6 rest 7 @@ -2228,10 +2228,10 @@ Branch_fbdf0: music_ret Branch_fbe03: - musicdx 2 + octave 2 note C_, 6 rest 7 - musicd8 + dec_octave note C_, 13 rest 13 note D_, 13 @@ -2243,16 +2243,16 @@ Branch_fbe03: music_ret Branch_fbe10: - musicdx 1 + octave 1 Loop 2 Loop 2 note E_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note G_, 13 - musicd8 + dec_octave musice8 8 note E_, 6 rest 7 @@ -2260,7 +2260,7 @@ Branch_fbe10: music_ret Branch_fbe23: - musicdx 2 + octave 2 Loop 2 note C_, 6 rest 7 @@ -2282,15 +2282,15 @@ Branch_fbe23: music_ret Branch_fbe3d: - musicdx 1 + octave 1 Loop 2 note G_, 6 rest 7 EndLoop - musicd7 + inc_octave musice8 4 note F_, 13 - musicd8 + dec_octave musice8 8 note G_, 6 rest 7 @@ -2302,8 +2302,8 @@ Branch_fbe3d: Music_Credits_Ch4: ; fbe51 (3e:7e51) - Speed 1 - musicdx 1 + speed 1 + octave 1 Loop 8 note snare2, 13 EndLoop @@ -2333,7 +2333,7 @@ Music_Credits_Ch4: ; fbe51 (3e:7e51) music_call Branch_fbed1 EndLoop music_call Branch_fbeea - Speed 13 + speed 13 note snare5, 8 rest 3 music_end @@ -2350,10 +2350,10 @@ Branch_fbe86: note bass, 13 note snare3, 13 note snare1, 13 - Speed 13 + speed 13 note snare5, 7 note snare1, 2 - Speed 1 + speed 1 Loop 15 music_call Branch_fbed1 EndLoop diff --git a/music/darkdiddly.asm b/music/darkdiddly.asm index e1438fe..078d4f5 100644 --- a/music/darkdiddly.asm +++ b/music/darkdiddly.asm @@ -1,12 +1,12 @@ Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf) - Speed 3 + speed 3 musicdc 17 musice8 8 - musicdx 4 - musice5 64 - musice6 176 + octave 4 + duty 1 + volume 176 note C_, 4 - musicd8 + dec_octave note B_, 2 note A#, 2 note A_, 2 @@ -19,42 +19,42 @@ Music_DarkDiddly_Ch1: ; f7cdf (3d:7cdf) note D_, 2 note C#, 2 note C_, 2 - musicd8 + dec_octave note B_, 2 note A#, 4 note B_, 2 - musice6 39 + volume 39 note B_, 2 - musice6 176 + volume 176 note F#, 4 note G_, 2 - musice6 39 + volume 39 note G_, 2 - musice6 176 + volume 176 note C_, 2 - musice6 39 + volume 39 note C_, 4 - musicd7 - musice6 176 + inc_octave + volume 176 note E_, 1 note G_, 1 - musicd7 + inc_octave note C_, 2 - musice6 39 + volume 39 note C_, 2 music_end Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17) - Speed 3 + speed 3 musicdc 17 musice8 8 - musicdx 3 - musice5 64 - musice6 176 + octave 3 + duty 1 + volume 176 rest 16 note C_, 4 - musicd8 + dec_octave note B_, 2 note A#, 2 note A_, 2 @@ -63,35 +63,35 @@ Music_DarkDiddly_Ch2: ; f7d17 (3d:7d17) note F#, 2 note F_, 4 note F#, 2 - musice6 39 + volume 39 note F#, 2 - musice6 176 + volume 176 note C#, 4 note D_, 2 - musice6 39 + volume 39 note D_, 2 - musicd8 - musice6 176 + dec_octave + volume 176 note G_, 2 - musice6 39 + volume 39 note G_, 6 - musicd7 - musicd7 - musice6 176 + inc_octave + inc_octave + volume 176 note E_, 2 - musice6 39 + volume 39 note E_, 2 music_end Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47) - Speed 6 + speed 6 musicdc 17 - musice7 1 - musice6 32 + duty3 1 + volume 32 musice8 8 musice9 0 - musicdx 1 + octave 1 rest 16 note G_, 2 note F#, 1 @@ -101,7 +101,7 @@ Music_DarkDiddly_Ch3: ; f7d47 (3d:7d47) rest 1 note C_, 1 rest 3 - musicd7 + inc_octave note C_, 1 music_end ; 0xf7d60
\ No newline at end of file diff --git a/music/deckmachine.asm b/music/deckmachine.asm index cc9d462..50b6601 100644 --- a/music/deckmachine.asm +++ b/music/deckmachine.asm @@ -1,54 +1,54 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) musicdc 17 musice8 8 - musice5 192 + duty 3 MainLoop - musicdx 5 - Speed 1 + octave 5 + speed 1 Loop 9 musice8 6 - musice6 145 + volume 145 note C_, 7 - musice6 49 + volume 49 note C_, 8 - musice6 65 + volume 65 note C_, 8 - musice6 145 + volume 145 note G_, 7 - musice6 49 + volume 49 note G_, 8 - musice6 65 + volume 65 note C_, 7 - musice6 145 + volume 145 note E_, 7 - musice6 49 + volume 49 note E_, 8 - musice6 65 + volume 65 note E_, 8 - musice6 145 + volume 145 note C_, 7 - musice6 49 + volume 49 note C_, 8 - musice6 65 + volume 65 note C_, 7 - musice6 145 + volume 145 note G_, 7 - musice6 49 + volume 49 note G_, 8 - musice6 145 + volume 145 musice8 4 note F_, 7 musice8 5 - musice6 65 + volume 65 note G_, 8 EndLoop - musice6 145 + volume 145 note C_, 7 - musice6 49 + volume 49 note C_, 8 - musice6 65 + volume 65 note C_, 15 - Speed 10 + speed 10 rest 9 EndMainLoop @@ -56,119 +56,119 @@ Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) musicdc 17 musice8 8 - musice5 64 + duty 1 musice8 7 MainLoop - musicdx 3 - Speed 1 + octave 3 + speed 1 Loop 9 rest 15 - musice6 178 + volume 178 rest 7 note C_, 8 - musice6 39 + volume 39 note C_, 8 rest 7 - musice6 178 + volume 178 note C_, 7 - musice6 39 + volume 39 note C_, 8 rest 7 - musice6 178 - musicd8 + volume 178 + dec_octave note A_, 8 - musice6 39 + volume 39 note A_, 8 rest 7 - musicd7 - musice6 178 + inc_octave + volume 178 note C_, 7 - musice6 39 + volume 39 note C_, 8 rest 15 EndLoop - musice6 178 + volume 178 note E_, 7 - musice6 39 + volume 39 note E_, 8 rest 15 - Speed 10 + speed 10 rest 9 EndMainLoop Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 96 musice8 8 MainLoop - musicdx 2 - Speed 1 + octave 2 + speed 1 Loop 4 note C_, 7 rest 8 note G_, 7 - musicd7 + inc_octave musice8 5 note G_, 8 musice8 8 rest 7 - musicd8 + dec_octave note C_, 8 - musicd7 + inc_octave musice8 5 note E_, 7 - musicd8 + dec_octave musice8 8 note C_, 8 note D_, 7 - musicd7 + inc_octave musice8 5 note C_, 8 - musicd8 + dec_octave rest 7 musice8 8 note A_, 8 - musicd7 + inc_octave musice8 5 note G_, 7 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note A_, 8 - musicd7 + inc_octave note D_, 7 rest 8 note E_, 7 rest 8 note G_, 7 - musicd7 + inc_octave musice8 5 note G_, 8 rest 7 - musicd8 + dec_octave musice8 8 note E_, 8 - musicd7 + inc_octave musice8 5 note E_, 7 - musicd8 + dec_octave musice8 8 note C_, 8 note F_, 7 - musicd7 + inc_octave musice8 5 note C_, 8 rest 7 - musicd8 + dec_octave musice8 8 note F_, 8 - musicd7 + inc_octave musice8 5 note G_, 7 - musicd8 + dec_octave musice8 8 note E_, 8 note D_, 7 @@ -177,44 +177,44 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) note C_, 7 rest 8 note G_, 7 - musicd7 + inc_octave musice8 5 note G_, 8 rest 7 - musicd8 + dec_octave musice8 8 note C_, 8 - musicd7 + inc_octave musice8 5 note E_, 7 - musicd8 - musicd8 + dec_octave + dec_octave musice8 8 note G_, 8 - musicd7 + inc_octave note C_, 7 - musicd7 + inc_octave musice8 5 note C_, 8 rest 7 - musicd8 + dec_octave musice8 8 note F_, 8 - musicd7 + inc_octave musice8 5 note G_, 7 - musicd8 + dec_octave musice8 8 note E_, 8 note D_, 7 rest 8 note C_, 15 rest 15 - Speed 10 + speed 10 rest 3 - Speed 1 + speed 1 rest 7 - musicd8 + dec_octave note G_, 15 rest 8 note A_, 7 @@ -225,8 +225,8 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) Music_DeckMachine_Ch4: ; f7018 (3d:7018) - Speed 1 - musicdx 1 + speed 1 + octave 1 MainLoop Loop 9 music_call Branch_f7031 diff --git a/music/hallofhonor.asm b/music/hallofhonor.asm index 10cb95b..798dad6 100644 --- a/music/hallofhonor.asm +++ b/music/hallofhonor.asm @@ -1,8 +1,8 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) - Speed 7 + speed 7 musicdc 17 musice8 8 - musice5 128 + duty 2 Loop 4 music_call Branch_fb016 EndLoop @@ -10,103 +10,103 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) Loop 8 music_call Branch_fb016 EndLoop - musicdx 4 - musice6 85 + octave 4 + volume 85 note C_, 1 - musice6 39 + volume 39 note C_, 1 music_call Branch_fb044 Loop 23 - musice6 85 + volume 85 note C_, 1 - musice6 39 + volume 39 note G_, 1 music_call Branch_fb044 EndLoop EndMainLoop Branch_fb016: - musicdx 4 - musice6 101 + octave 4 + volume 101 note C_, 1 - musice6 39 + volume 39 note C_, 1 - musice6 101 + volume 101 note F_, 1 - musice6 39 + volume 39 note F_, 1 - musice6 101 + volume 101 note G_, 1 - musice6 39 + volume 39 note G_, 1 - musice6 101 + volume 101 note F_, 1 - musice6 39 + volume 39 note F_, 1 - musicd7 - musice6 101 + inc_octave + volume 101 note C_, 1 - musice6 39 + volume 39 note C_, 1 - musicd8 - musice6 101 + dec_octave + volume 101 note F_, 1 - musice6 39 + volume 39 note F_, 1 - musice6 101 + volume 101 note G_, 1 - musice6 39 + volume 39 note G_, 1 music_ret Branch_fb044: - musicdx 4 - musice6 85 + octave 4 + volume 85 note F_, 1 - musice6 39 + volume 39 note C_, 1 - musice6 85 + volume 85 note G_, 1 - musice6 39 + volume 39 note F_, 1 - musice6 85 + volume 85 note F_, 1 - musice6 39 + volume 39 note G_, 1 - musicd7 - musice6 85 + inc_octave + volume 85 note C_, 1 - musicd8 - musice6 39 + dec_octave + volume 39 note F_, 1 - musice6 85 + volume 85 note F_, 1 - musicd7 - musice6 39 + inc_octave + volume 39 note C_, 1 - musicd8 - musice6 85 + dec_octave + volume 85 note G_, 1 - musice6 39 + volume 39 note F_, 1 music_ret Music_HallOfHonor_Ch2: ; fb06e (3e:706e) - Speed 7 + speed 7 musicdc 17 musice8 8 - musice5 128 + duty 2 musice4 255 rest 2 - Speed 1 + speed 1 rest 4 - Speed 7 - musice6 23 + speed 7 + volume 23 Loop 3 music_call Branch_fb1ec EndLoop - musicdx 4 + octave 4 note C_, 1 rest 1 note F_, 1 @@ -115,79 +115,79 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) rest 1 note F_, 1 rest 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave note F_, 1 - Speed 1 + speed 1 rest 3 - Speed 7 + speed 7 musice4 0 MainLoop - musicdx 1 - musice5 64 + octave 1 + duty 1 Loop 3 music_call Branch_fb0bb - musicdx 1 - musice6 109 + octave 1 + volume 109 note E_, 5 - musice6 208 + volume 208 note E_, 11 - musicd9 + no_fade note E_, 12 EndLoop music_call Branch_fb0bb - musicdx 1 - musice6 109 + octave 1 + volume 109 note G_, 5 - musice6 208 + volume 208 note G_, 11 - musicd9 + no_fade note G_, 12 EndMainLoop Branch_fb0bb: - musicdx 1 - musice6 109 + octave 1 + volume 109 note F_, 5 - musice6 208 + volume 208 note F_, 11 - musicd9 + no_fade note F_, 12 - musice6 109 + volume 109 note E_, 5 - musice6 208 + volume 208 note E_, 11 - musicd9 + no_fade note E_, 12 - musice6 109 + volume 109 note D_, 5 - musice6 208 + volume 208 note D_, 11 - musicd9 + no_fade note D_, 12 music_ret Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) - Speed 7 - musice6 64 + speed 7 + volume 64 musicdc 17 - musice7 2 - musicea 4 - musiceb 35 + duty3 2 + vibrato_rate 4 + vibrato_delay 35 musice8 6 musice9 64 rest 3 - musice6 96 + volume 96 musice8 8 musice4 255 Loop 4 rest 14 EndLoop MainLoop - musicdx 5 + octave 5 Loop 7 music_call Branch_fb1ec EndLoop @@ -199,25 +199,25 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) rest 1 note F_, 1 rest 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave note F_, 1 - musice6 32 + volume 32 musice4 0 - musicdx 4 - Speed 1 + octave 4 + speed 1 musice8 6 note B_, 3 - musicd7 + inc_octave note C_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note C_, 15 - musicd9 + no_fade note C_, 8 - musicd8 + dec_octave musice8 8 note B_, 2 musice8 4 @@ -225,115 +225,115 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) musice8 6 note G_, 6 note C_, 10 - musicd9 + no_fade note C_, 12 - Speed 1 + speed 1 musice8 8 note B_, 3 - musicd7 + inc_octave musice8 6 note C_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note C_, 15 - musicd9 + no_fade note C_, 6 - musicd8 + dec_octave musice8 8 note B_, 2 - musicd7 + inc_octave note C_, 2 musice8 4 note D_, 2 - musicd8 - Speed 1 + dec_octave + speed 1 musice8 8 note F#, 3 musice8 6 note G_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 15 - musicd9 + no_fade note G_, 6 musice8 8 note G_, 2 note A_, 2 musice8 4 note B_, 2 - Speed 1 + speed 1 musice8 8 note B_, 3 - musicd7 + inc_octave note C_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note C_, 15 - musicd9 + no_fade note C_, 8 - musicd8 + dec_octave note B_, 2 musice8 4 note A_, 2 musice8 6 note G_, 6 musice8 8 - Speed 1 + speed 1 note B_, 3 - musicd7 + inc_octave musice8 6 note C_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note C_, 9 - musicd9 + no_fade note C_, 6 - musicd8 + dec_octave musice8 8 note G_, 2 - musicd7 + inc_octave note C_, 2 musice8 4 note E_, 2 - Speed 1 + speed 1 musice8 8 note E_, 3 note F_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note F_, 1 note E_, 2 musice8 4 note C_, 2 musice8 7 note C_, 10 - musicd9 + no_fade note C_, 10 musice8 4 note E_, 2 - Speed 1 + speed 1 musice8 8 note E_, 3 note F_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note F_, 1 note E_, 2 musice8 4 note C_, 2 musice8 6 note C_, 10 - musicd9 + no_fade note C_, 12 - Speed 1 + speed 1 musice8 8 note F#, 3 musice8 7 note G_, 4 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 15 - musicd9 + no_fade note G_, 8 musice8 8 note F_, 2 @@ -344,40 +344,40 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) musice8 4 note E_, 2 note C_, 2 - musicd8 + dec_octave musice8 7 note G_, 10 - musicd9 + no_fade note G_, 10 musice8 8 note E_, 2 note F_, 2 - musicd7 + inc_octave musice8 4 note C_, 2 musice8 7 note C_, 12 - musicd9 + no_fade note C_, 10 - musicd8 + dec_octave musice8 8 note E_, 2 note F_, 2 - musicd7 + inc_octave musice8 4 note C_, 2 musice8 6 note C_, 12 - musicd9 + no_fade note C_, 12 rest 3 - musice6 96 + volume 96 musice4 255 musice8 8 EndMainLoop Branch_fb1ec: - musicdx 4 + octave 4 note C_, 1 rest 1 note F_, 1 @@ -386,10 +386,10 @@ Branch_fb1ec: rest 1 note F_, 1 rest 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd8 + dec_octave note F_, 1 rest 1 note G_, 1 diff --git a/music/imakuni.asm b/music/imakuni.asm index 94600ad..bb5588f 100644 --- a/music/imakuni.asm +++ b/music/imakuni.asm @@ -1,57 +1,57 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) - Speed 3 + speed 3 musicdc 17 - musicea 5 - musiceb 20 + vibrato_rate 5 + vibrato_delay 20 musice8 8 - musice5 128 - musice6 160 + duty 2 + volume 160 MainLoop Loop 16 rest 10 EndLoop music_call Branch_fadf9 - musicdx 4 + octave 4 note D_, 15 - musicd8 + dec_octave note B_, 7 rest 8 note G_, 7 rest 8 - Speed 9 + speed 9 note F_, 10 - musicd9 - Speed 1 + no_fade + speed 1 note F_, 7 rest 8 - Speed 9 + speed 9 rest 10 music_call Branch_fadf9 music_call Branch_fae1d - Speed 1 - musicdx 4 + speed 1 + octave 4 note E_, 7 rest 15 note E_, 3 note C_, 2 note E_, 3 note C_, 15 - musicd8 + dec_octave note G#, 15 note A_, 7 rest 8 - Speed 3 + speed 3 rest 15 - Speed 1 + speed 1 rest 15 rest 15 - musicd7 + inc_octave note E_, 7 rest 8 note F#, 7 rest 8 note G_, 15 - musicd9 + no_fade note G_, 7 note F#, 3 note G_, 2 @@ -63,36 +63,36 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note E_, 15 note C_, 7 rest 8 - musicd8 + dec_octave note G#, 7 rest 8 - Speed 7 + speed 7 note F#, 15 - Speed 9 + speed 9 rest 10 music_call Branch_fadf9 music_call Branch_fae1d - musicd8 - Speed 1 + dec_octave + speed 1 note F_, 7 rest 8 note B_, 7 - musicd7 + inc_octave note C_, 8 - musicd8 + dec_octave note G#, 7 note A_, 8 note F_, 7 rest 8 note B_, 7 - musicd7 + inc_octave note C_, 8 - musicd8 + dec_octave note G#, 7 note A_, 8 - Speed 3 + speed 3 note F_, 10 - Speed 1 + speed 1 note D#, 7 rest 8 note A_, 7 @@ -105,47 +105,47 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note A#, 8 note F#, 7 note G_, 8 - Speed 3 + speed 3 note D#, 10 - Speed 1 + speed 1 Loop 4 note D_, 7 - musicd8 + dec_octave note A_, 8 note D_, 7 note A_, 8 note D_, 7 note A_, 8 - musicd7 + inc_octave EndLoop note D_, 7 - musicd8 + dec_octave note A_, 8 note D_, 7 note A_, 8 - musiceb 5 - Speed 3 + vibrato_delay 5 + speed 3 note D_, 10 - musiceb 20 + vibrato_delay 20 EndMainLoop Branch_fadf9: - Speed 1 - musicdx 4 + speed 1 + octave 4 note C#, 7 rest 15 note C#, 3 note D_, 2 note C#, 3 - musicd8 + dec_octave note A#, 15 note B_, 15 - musicd7 + inc_octave note D_, 7 rest 8 - Speed 5 + speed 5 rest 9 - Speed 1 + speed 1 rest 15 rest 15 note D_, 7 @@ -153,7 +153,7 @@ Branch_fadf9: note E_, 7 rest 8 note F_, 15 - musicd9 + no_fade note F_, 7 note E_, 3 note F_, 2 @@ -165,68 +165,68 @@ Branch_fadf9: music_ret Branch_fae1d: - musicdx 4 + octave 4 note D_, 7 rest 8 - musicd8 + dec_octave note G_, 7 rest 8 - musicd7 + inc_octave note G_, 7 rest 8 - Speed 9 + speed 9 note F_, 10 - musicd9 - Speed 1 + no_fade + speed 1 note F_, 7 rest 8 - Speed 9 + speed 9 rest 10 music_ret Music_Imakuni_Ch2: ; fae32 (3e:6e32) musicdc 17 - musicea 0 - musiceb 0 + vibrato_rate 0 + vibrato_delay 0 musice8 8 - musice5 64 - musice6 160 + duty 1 + volume 160 Loop 6 music_call Branch_faea5 EndLoop Loop 2 Loop 2 - Speed 3 + speed 3 rest 10 - Speed 1 + speed 1 note C_, 7 rest 8 EndLoop rest 15 note C_, 7 rest 8 - Speed 3 + speed 3 rest 10 - Speed 1 + speed 1 note C_, 7 rest 8 rest 15 - Speed 3 + speed 3 rest 10 - musiceb 8 + vibrato_delay 8 note C_, 10 - musiceb 0 + vibrato_delay 0 EndLoop Loop 2 music_call Branch_faea5 EndLoop - Speed 1 - musicdx 2 + speed 1 + octave 2 note F_, 15 - musicd9 + no_fade note F_, 7 - musicd7 + inc_octave note F_, 8 note D#, 7 rest 8 @@ -235,14 +235,14 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note A_, 8 note F_, 7 note D#, 8 - Speed 3 + speed 3 rest 10 - Speed 1 - musicd8 + speed 1 + dec_octave note D#, 15 - musicd9 + no_fade note D#, 7 - musicd7 + inc_octave note D#, 8 note C#, 7 rest 8 @@ -251,9 +251,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note G_, 8 note D#, 7 note C#, 8 - Speed 3 + speed 3 rest 10 - Speed 1 + speed 1 Loop 4 note D_, 7 rest 8 @@ -264,115 +264,115 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note D_, 7 rest 8 rest 15 - musiceb 5 + vibrato_delay 5 note D_, 15 - musicd9 + no_fade note D_, 7 rest 8 - musiceb 0 + vibrato_delay 0 EndMainLoop Branch_faea5: - musicdx 3 - Speed 6 + octave 3 + speed 6 rest 10 - Speed 1 + speed 1 Loop 2 rest 15 note C#, 7 rest 8 EndLoop - musiceb 8 - Speed 9 + vibrato_delay 8 + speed 9 rest 10 - Speed 3 + speed 3 note C#, 10 - musiceb 0 + vibrato_delay 0 music_ret Music_Imakuni_Ch3: ; faebc (3e:6ebc) musicdc 17 - musice6 32 - musice7 1 - musicea 6 - musiceb 0 + volume 32 + duty3 1 + vibrato_rate 6 + vibrato_delay 0 musice9 0 musice8 8 MainLoop music_call Branch_faf7d - musiceb 8 - Speed 1 + vibrato_delay 8 + speed 1 note D_, 15 - musicd9 + no_fade note D_, 7 - musicd7 - musiceb 0 + inc_octave + vibrato_delay 0 note G_, 3 - musicd8 + dec_octave note G_, 2 - musicd8 + dec_octave note G_, 3 music_call Branch_faf7d - musiceb 8 + vibrato_delay 8 note D_, 10 - musiceb 0 + vibrato_delay 0 Loop 4 music_call Branch_faf7d - musiceb 8 + vibrato_delay 8 note D_, 10 - musiceb 0 + vibrato_delay 0 EndLoop Loop 2 - musicdx 2 - Speed 3 + octave 2 + speed 3 note C_, 5 rest 5 - musicd7 - Speed 1 + inc_octave + speed 1 note E_, 7 rest 8 - musicd8 - Speed 3 + dec_octave + speed 3 note G#, 5 note A_, 5 - musicd7 - Speed 1 + inc_octave + speed 1 note D#, 7 rest 8 rest 15 note D#, 7 rest 8 - Speed 3 + speed 3 rest 5 - musicd8 + dec_octave note C_, 5 - musicd7 - Speed 1 + inc_octave + speed 1 note E_, 7 rest 8 - musicd8 - Speed 3 + dec_octave + speed 3 note G#, 5 note A_, 5 rest 5 - musicd7 - musiceb 8 + inc_octave + vibrato_delay 8 note D#, 10 - musiceb 0 + vibrato_delay 0 EndLoop Loop 2 music_call Branch_faf7d - musiceb 8 + vibrato_delay 8 note D_, 10 - musiceb 0 + vibrato_delay 0 EndLoop - Speed 1 - musicdx 1 + speed 1 + octave 1 note F_, 15 - musicd9 + no_fade note F_, 7 - musicd7 + inc_octave note F_, 8 note D#, 7 rest 8 @@ -382,16 +382,16 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note A_, 8 note F_, 7 note D#, 8 - musiceb 5 - Speed 3 + vibrato_delay 5 + speed 3 note F_, 10 - musiceb 0 - Speed 1 - musicd8 + vibrato_delay 0 + speed 1 + dec_octave note D#, 15 - musicd9 + no_fade note D#, 7 - musicd7 + inc_octave note D#, 8 note C#, 7 rest 8 @@ -401,80 +401,80 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note G_, 8 note D#, 7 note C#, 8 - musiceb 5 - Speed 3 + vibrato_delay 5 + speed 3 note D#, 10 - musiceb 0 - Speed 1 + vibrato_delay 0 + speed 1 Loop 4 - musicdx 3 + octave 3 note C_, 7 rest 8 - musicdx 1 + octave 1 note D_, 7 rest 8 note D_, 7 rest 8 EndLoop - musicdx 3 + octave 3 note C_, 7 rest 8 - musicdx 1 + octave 1 note D_, 7 rest 8 - musicdx 3 - musiceb 5 + octave 3 + vibrato_delay 5 note C_, 15 - musicd9 + no_fade note C_, 7 - musicd7 - musiceb 0 + inc_octave + vibrato_delay 0 note G_, 3 - musicd8 + dec_octave note G_, 2 - musicd8 + dec_octave note G_, 3 - Speed 8 + speed 8 EndMainLoop Branch_faf7d: - Speed 3 - musicdx 1 + speed 3 + octave 1 note G_, 5 rest 5 - musicd7 - Speed 1 + inc_octave + speed 1 note G_, 7 rest 8 - Speed 3 + speed 3 note C#, 5 note D_, 5 - musicd7 - Speed 1 + inc_octave + speed 1 note D_, 7 rest 8 rest 15 note D_, 7 rest 8 - Speed 3 + speed 3 rest 5 - musicdx 1 + octave 1 note G_, 5 - musicd7 - Speed 1 + inc_octave + speed 1 note G_, 7 rest 8 - Speed 3 + speed 3 note C#, 5 note D_, 5 rest 5 - musicd7 + inc_octave music_ret Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) - Speed 1 - musicdx 1 + speed 1 + octave 1 Loop 10 note bass, 15 note snare3, 7 @@ -499,9 +499,9 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) note snare1, 8 EndLoop Loop 2 - Speed 11 + speed 11 note snare5, 2 - Speed 1 + speed 1 note snare1, 8 note snare1, 15 note snare1, 15 @@ -509,10 +509,10 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) note snare1, 8 note snare1, 7 note snare1, 8 - Speed 3 + speed 3 note snare5, 10 EndLoop - Speed 1 + speed 1 note snare1, 15 note snare3, 7 note snare1, 8 diff --git a/music/matchloss.asm b/music/matchloss.asm index 261880f..7b1b75c 100644 --- a/music/matchloss.asm +++ b/music/matchloss.asm @@ -1,129 +1,129 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 4 - musice5 128 - musice6 176 - Speed 1 + octave 4 + duty 2 + volume 176 + speed 1 note E_, 3 note F_, 2 - musicd9 - Speed 5 + no_fade + speed 5 note F_, 3 note C_, 1 - musice6 55 + volume 55 note C_, 3 - musicd8 - musice6 160 + dec_octave + volume 160 note A#, 1 - musice6 55 + volume 55 note A#, 3 - musicd7 - Speed 1 - musice6 160 + inc_octave + speed 1 + volume 160 note D_, 3 note D#, 2 - musicd9 + no_fade note D#, 16 - musicd8 + dec_octave note A#, 6 - musice6 55 + volume 55 note A#, 16 - musice6 160 + volume 160 note G#, 6 - musice6 55 + volume 55 note G#, 16 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 3 note C#, 8 - musicd9 + no_fade note C#, 12 - musicd8 - Speed 6 + dec_octave + speed 6 note G#, 1 - musice6 55 + volume 55 note G#, 3 - musice6 160 + volume 160 note F#, 1 - Speed 7 - musice6 55 + speed 7 + volume 55 note F#, 3 - Speed 1 - musice6 160 + speed 1 + volume 160 note B_, 5 - musicd7 + inc_octave note C_, 4 - musicd9 - Speed 9 + no_fade + speed 9 note C_, 11 - musice6 55 + volume 55 note C_, 2 music_end Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) musicdc 17 - musicea 5 - musiceb 20 + vibrato_rate 5 + vibrato_delay 20 musice8 8 - musicdx 3 - musice5 128 - musice6 144 - Speed 9 + octave 3 + duty 2 + volume 144 + speed 9 rest 9 - Speed 11 + speed 11 rest 5 - Speed 1 + speed 1 rest 8 - Speed 9 + speed 9 rest 6 note G_, 6 - musicd9 + no_fade note G_, 6 - musice6 55 + volume 55 note G_, 2 music_end Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) musicdc 17 - musice7 1 - musice6 32 + duty3 1 + volume 32 musice8 8 musice9 64 - musicdx 1 - Speed 5 + octave 1 + speed 5 note A#, 4 - musicd7 + inc_octave musice8 4 note F_, 4 note A#, 4 - musicd8 + dec_octave musice8 8 - Speed 7 + speed 7 note G#, 3 - musicd7 + inc_octave musice8 4 - Speed 2 + speed 2 note D#, 11 note G#, 11 - musicd8 + dec_octave musice8 8 - Speed 1 + speed 1 note F#, 11 - musicd9 + no_fade note F#, 12 - musicd7 + inc_octave musice8 4 - Speed 12 + speed 12 note C#, 2 - Speed 2 + speed 2 note F#, 13 - musicd8 - Speed 9 + dec_octave + speed 9 musice8 8 note F_, 12 music_end diff --git a/music/matchstart1.asm b/music/matchstart1.asm index 972a455..775ab51 100644 --- a/music/matchstart1.asm +++ b/music/matchstart1.asm @@ -1,54 +1,54 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) - Speed 1 + speed 1 musicdc 17 musice8 8 Loop 3 - musice5 128 - musice6 240 - musicdx 3 + duty 2 + volume 240 + octave 3 note C_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note G_, 1 - musicdx 3 + octave 3 note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 - musicdx 4 - musice5 64 + octave 4 + duty 1 note C_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 - musicd7 + inc_octave note G_, 1 - musicdx 4 + octave 4 note D_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 EndLoop - musicdx 4 - musice6 96 + octave 4 + volume 96 note E_, 1 - musicd7 + inc_octave note E_, 1 - musicdx 4 - musice6 32 - musicd8 + octave 4 + volume 32 + dec_octave note B_, 1 - musicd7 + inc_octave note B_, 1 music_end ; 0xf7956
\ No newline at end of file diff --git a/music/matchstart2.asm b/music/matchstart2.asm index 1f2d061..49f395e 100644 --- a/music/matchstart2.asm +++ b/music/matchstart2.asm @@ -1,175 +1,175 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) - Speed 1 + speed 1 musicdc 17 musice8 8 - musicdx 2 - musice6 240 - musice5 0 + octave 2 + volume 240 + duty 0 note C_, 1 note E_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note A_, 1 - musicd8 + dec_octave note D_, 1 note F_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 note F_, 1 note B_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 3 + octave 3 note C_, 1 note E_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note A_, 1 - musicd8 + dec_octave note D_, 1 note F_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 note F_, 1 note B_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 4 + octave 4 note C_, 1 note E_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note A_, 1 - musicd8 + dec_octave note D_, 1 note F_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 note F_, 1 note B_, 1 - musicd8 - musice6 96 + dec_octave + volume 96 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 - musice6 32 + volume 32 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 music_end Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) - Speed 1 + speed 1 musicdc 17 musice8 8 musice4 6 rest 4 - musicdx 2 - musice6 96 - musice5 0 + octave 2 + volume 96 + duty 0 note C_, 1 note E_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note A_, 1 - musicd8 + dec_octave note D_, 1 note F_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 note F_, 1 note B_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 3 + octave 3 note C_, 1 note E_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note A_, 1 - musicd8 + dec_octave note D_, 1 note F_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 note F_, 1 note B_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 4 + octave 4 note C_, 1 note E_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 note A_, 1 - musicd8 + dec_octave note D_, 1 note F_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 note F_, 1 note B_, 1 - musicd8 - musice6 32 + dec_octave + volume 32 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note E_, 1 music_end diff --git a/music/matchstart3.asm b/music/matchstart3.asm index 2c24005..c564b7a 100644 --- a/music/matchstart3.asm +++ b/music/matchstart3.asm @@ -1,10 +1,10 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) - Speed 1 + speed 1 musicdc 17 musice8 8 - musicdx 2 - musice6 240 - musice5 64 + octave 2 + volume 240 + duty 1 note C_, 1 note E_, 1 note G_, 1 @@ -15,7 +15,7 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) note E_, 1 note G_, 1 note B_, 1 - musicdx 3 + octave 3 note C_, 1 note E_, 1 note G_, 1 @@ -26,7 +26,7 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) note E_, 1 note G_, 1 note B_, 1 - musicdx 4 + octave 4 note C_, 1 note E_, 1 note G_, 1 @@ -37,141 +37,141 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) note E_, 1 note G_, 1 note B_, 1 - musicdx 5 + octave 5 note C_, 1 note E_, 1 note G_, 1 note B_, 1 - musicdx 2 - musice5 192 + octave 2 + duty 3 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 3 + octave 3 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 4 + octave 4 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 5 + octave 5 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 2 - musice5 64 + octave 2 + duty 1 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicdx 3 + octave 3 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicdx 4 + octave 4 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicdx 5 + octave 5 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 - musicdx 4 - musice6 96 + dec_octave + octave 4 + volume 96 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 - musicdx 5 - musice6 32 + dec_octave + octave 5 + volume 32 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 music_end Music_MatchStart3_Ch2: ; f7aba (3d:7aba) - Speed 1 + speed 1 musicdc 17 musice8 8 musice4 6 rest 4 - musicdx 2 - musice6 96 - musice5 64 + octave 2 + volume 96 + duty 1 note C_, 1 note E_, 1 note G_, 1 @@ -182,7 +182,7 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note E_, 1 note G_, 1 note B_, 1 - musicdx 3 + octave 3 note C_, 1 note E_, 1 note G_, 1 @@ -193,7 +193,7 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note E_, 1 note G_, 1 note B_, 1 - musicdx 4 + octave 4 note C_, 1 note E_, 1 note G_, 1 @@ -204,122 +204,122 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note E_, 1 note G_, 1 note B_, 1 - musicdx 5 + octave 5 note C_, 1 note E_, 1 note G_, 1 note B_, 1 - musicdx 2 - musice5 192 + octave 2 + duty 3 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 3 + octave 3 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 4 + octave 4 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note E_, 1 note G_, 1 note B_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 5 + octave 5 note D_, 1 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicdx 2 - musice5 64 + octave 2 + duty 1 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicdx 3 + octave 3 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicdx 4 + octave 4 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicdx 5 + octave 5 note E_, 1 note G_, 1 note B_, 1 - musicd7 + inc_octave note D_, 1 - musicd8 - musicdx 4 - musice6 32 + dec_octave + octave 4 + volume 32 note F_, 1 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave music_end ; 0xf7b61
\ No newline at end of file diff --git a/music/matchvictory.asm b/music/matchvictory.asm index f4d50b4..0d18824 100644 --- a/music/matchvictory.asm +++ b/music/matchvictory.asm @@ -1,131 +1,131 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 3 - musice5 0 - musice6 176 - Speed 1 + octave 3 + duty 0 + volume 176 + speed 1 note A_, 15 - musicd9 + no_fade note A_, 9 - musice6 39 + volume 39 note A_, 5 - musice6 176 + volume 176 note A_, 7 - musice6 39 + volume 39 note A_, 3 - musice6 176 + volume 176 note F_, 7 - musice6 39 + volume 39 note F_, 3 - musice6 176 + volume 176 note A_, 7 - musice6 39 + volume 39 note A_, 2 - musice6 176 + volume 176 note B_, 11 - musice6 39 + volume 39 note B_, 10 - musicd7 - musice6 176 + inc_octave + volume 176 note C_, 10 - musice6 39 + volume 39 note C_, 11 - musice6 176 + volume 176 note D_, 10 - musice6 39 + volume 39 note D_, 10 - musice6 176 + volume 176 note C#, 8 - musice6 39 + volume 39 note C#, 13 - musice6 176 + volume 176 note D_, 5 - musice6 39 + volume 39 note D_, 6 - musice6 176 - Speed 8 + volume 176 + speed 8 note E_, 12 - musice6 39 + volume 39 note E_, 4 music_end Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 3 - musice5 0 - musice6 176 - Speed 1 + octave 3 + duty 0 + volume 176 + speed 1 note F_, 5 - musice6 39 + volume 39 note F_, 5 - musicd8 - musice6 176 + dec_octave + volume 176 note A_, 5 - musicd7 + inc_octave note C_, 5 note F_, 5 - musice6 39 + volume 39 note F_, 4 - musice6 176 + volume 176 note C_, 7 - musice6 39 + volume 39 note C_, 3 - musicd8 - musice6 176 + dec_octave + volume 176 note A_, 7 - musice6 39 + volume 39 note A_, 3 - musicd7 - musice6 176 + inc_octave + volume 176 note C_, 7 - musice6 39 + volume 39 note C_, 2 - musice6 176 + volume 176 note G_, 11 - musice6 39 + volume 39 note G_, 10 - musice6 176 + volume 176 note A_, 10 - musice6 39 + volume 39 note A_, 11 - musice6 176 + volume 176 note B_, 10 - musice6 39 + volume 39 note B_, 10 - musice6 176 + volume 176 note A_, 8 - musice6 39 + volume 39 note A_, 13 - musice6 176 + volume 176 note B_, 5 - musice6 39 + volume 39 note B_, 6 - musicd7 - musice6 176 - Speed 8 + inc_octave + volume 176 + speed 8 note C#, 12 - musice6 39 + volume 39 note C#, 4 music_end Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) musicdc 17 - musice7 1 - musice6 32 + duty3 1 + volume 32 musice8 8 musice9 0 - musicdx 1 - Speed 1 + octave 1 + speed 1 note F_, 15 - musicd9 + no_fade note F_, 9 rest 5 note F_, 7 @@ -144,7 +144,7 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) rest 13 note E_, 5 rest 6 - Speed 8 + speed 8 note A_, 12 music_end ; 0xf7c2e
\ No newline at end of file diff --git a/music/medal.asm b/music/medal.asm index 4bb2fe3..45f8bab 100644 --- a/music/medal.asm +++ b/music/medal.asm @@ -1,143 +1,143 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 2 - musice5 64 - musice6 160 - Speed 1 + octave 2 + duty 1 + volume 160 + speed 1 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 5 - musicd8 - musicd8 + dec_octave + dec_octave note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 5 - Speed 15 + speed 15 note A_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 10 - musice6 55 + volume 55 note A_, 5 - musice6 160 + volume 160 musice8 7 note A_, 5 note A_, 5 note A_, 5 musice8 8 note A_, 15 - musice6 55 + volume 55 note A_, 5 - musice6 160 + volume 160 note A_, 16 - musice6 55 + volume 55 note A_, 5 - musice6 160 + volume 160 note A_, 16 - musice6 55 + volume 55 note A_, 6 - musice6 160 - Speed 9 + volume 160 + speed 9 note A_, 5 - musicd9 + no_fade note A_, 8 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 2 - musice6 55 + volume 55 note A_, 16 music_end Music_Medal_Ch2: ; f7e4b (3d:7e4b) musicdc 17 - musicea 1 - musiceb 20 + vibrato_rate 1 + vibrato_delay 20 musice8 8 - musicdx 1 - musice5 0 - musice6 144 - Speed 1 + octave 1 + duty 0 + volume 144 + speed 1 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 5 - musicd8 + dec_octave note C#, 5 note E_, 5 note A_, 5 - musicd7 + inc_octave note C#, 5 note E_, 5 note A_, 5 - musicd7 - Speed 15 + inc_octave + speed 15 note C_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note C_, 10 - musice6 39 + volume 39 note C_, 5 - musice6 160 + volume 160 musice8 7 note C_, 5 note C_, 5 note C_, 5 musice8 8 note D_, 15 - musice6 55 + volume 55 note D_, 5 - musice6 144 + volume 144 note D_, 16 - musice6 39 + volume 39 note D_, 5 - musice6 144 + volume 144 note D_, 16 - musice6 55 + volume 55 note D_, 6 - musice6 144 - Speed 9 + volume 144 + speed 9 note C#, 5 - musicd9 + no_fade note C#, 8 - musicd9 - Speed 1 + no_fade + speed 1 note C#, 2 - musice6 39 + volume 39 note C#, 16 music_end Music_Medal_Ch3: ; f7e9d (3d:7e9d) musicdc 17 - musice7 1 - musice6 32 + duty3 1 + volume 32 musice8 8 musice9 0 - musicdx 1 - Speed 1 - Speed 15 + octave 1 + speed 1 + speed 15 rest 4 note F_, 2 - musicd9 - Speed 1 + no_fade + speed 1 note F_, 10 rest 5 musice8 7 @@ -151,10 +151,10 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) rest 5 note A#, 16 rest 6 - Speed 9 + speed 9 note A_, 13 - musicd9 - Speed 1 + no_fade + speed 1 note A_, 2 music_end ; 0xf7ec8
\ No newline at end of file diff --git a/music/overworld.asm b/music/overworld.asm index 0c80dfe..5854d82 100644 --- a/music/overworld.asm +++ b/music/overworld.asm @@ -1,313 +1,313 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) - Speed 7 - musice5 0 + speed 7 + duty 0 musicdc 17 - musicea 9 - musiceb 25 - musice6 162 + vibrato_rate 9 + vibrato_delay 25 + volume 162 musice8 7 - musicdx 3 + octave 3 rest 3 music_call Branch_f72ba rest 3 MainLoop music_call Branch_f72ba - musice5 64 + duty 1 musice8 8 - musicdx 3 - musice6 160 + octave 3 + volume 160 note A_, 5 - musice6 55 + volume 55 note A_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 5 - musice6 55 + volume 55 note C_, 1 - musice6 160 + volume 160 note F_, 3 - Speed 1 + speed 1 note E_, 11 - musice6 55 + volume 55 note E_, 10 - musice6 160 - Speed 7 + volume 160 + speed 7 note G_, 3 - Speed 1 + speed 1 note F_, 11 - musice6 55 + volume 55 note F_, 10 - Speed 7 - musice6 160 + speed 7 + volume 160 note C_, 12 - musice6 55 + volume 55 note C_, 2 - musice5 0 - musice6 146 + duty 0 + volume 146 musice8 7 - musicdx 3 + octave 3 note E_, 4 note E_, 3 note E_, 3 - musice5 64 - musice6 160 + duty 1 + volume 160 musice8 8 music_call Branch_f72fb note C_, 6 - musice6 55 + volume 55 note C_, 6 - musice6 160 + volume 160 note C_, 3 note D_, 3 note E_, 3 note G_, 6 - musice6 55 + volume 55 note G_, 3 - musice6 160 + volume 160 note F_, 4 - musice6 55 + volume 55 note F_, 2 - musice6 160 + volume 160 note C_, 3 - musicd8 + dec_octave note A_, 6 note A#, 9 - musice6 55 + volume 55 note A#, 6 - musice6 160 + volume 160 note A#, 3 - musicd7 + inc_octave note D_, 3 note F_, 3 note A_, 3 - musice6 55 + volume 55 note A_, 6 - musice6 160 + volume 160 note G_, 3 - musice6 55 + volume 55 note G_, 3 - musice6 160 + volume 160 note E_, 3 note D_, 3 - musice6 55 + volume 55 note D_, 3 - musice6 160 + volume 160 note E_, 2 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 musice8 8 note C_, 9 - musice6 55 + volume 55 note C_, 3 - musice6 160 - musicd8 + volume 160 + dec_octave note A_, 3 - musicd7 - Speed 1 + inc_octave + speed 1 note C_, 11 - musice6 64 + volume 64 note C_, 10 - Speed 7 - musice6 160 + speed 7 + volume 160 note G_, 3 - Speed 1 + speed 1 note F_, 11 - musice6 64 + volume 64 note F_, 10 - Speed 7 - musice6 160 + speed 7 + volume 160 note C_, 12 - musice6 55 + volume 55 note C_, 6 - musice5 128 + duty 2 musice8 8 - musice6 95 - musicdx 4 + volume 95 + octave 4 note G_, 1 - musicd9 + no_fade note E_, 1 - musicd9 + no_fade note C_, 1 - musicd9 - musicd8 + no_fade + dec_octave note G_, 1 - musicd9 + no_fade note E_, 1 - musicd9 + no_fade note C_, 1 - musice5 64 - musice6 160 + duty 1 + volume 160 musice8 8 music_call Branch_f72fb note C_, 6 - musice6 55 + volume 55 note C_, 6 - musice6 160 + volume 160 note C_, 3 note D_, 3 note E_, 3 note F_, 9 - musice6 55 + volume 55 note F_, 12 - musice6 160 + volume 160 note F_, 2 note G_, 1 note A_, 1 - musice6 55 + volume 55 note A_, 2 - musice6 160 + volume 160 note A_, 12 - musice6 55 + volume 55 note A_, 3 - musice6 160 + volume 160 note D_, 3 note A_, 3 note A#, 9 - musice6 55 + volume 55 note A#, 6 - musice6 160 + volume 160 note A_, 5 - musice6 55 + volume 55 note A_, 1 - musice6 160 + volume 160 note G_, 5 - musice6 55 + volume 55 note G_, 1 - musice6 144 + volume 144 note F_, 8 - musicd9 + no_fade note F_, 8 - musicd9 + no_fade note F_, 8 - musicd9 + no_fade note F_, 8 - musicd9 + no_fade note F_, 8 - musicd9 + no_fade note F_, 8 - musice6 55 + volume 55 note F_, 3 - musice5 0 - musice6 162 + duty 0 + volume 162 musice8 7 EndMainLoop Branch_f72ba: - musicdx 3 + octave 3 note F_, 3 note F_, 2 note A_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 musice8 4 note C_, 1 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note A#, 3 note A#, 1 - musicd7 - musice6 160 + inc_octave + volume 160 musice8 4 note D_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note G_, 3 note A#, 3 rest 3 note A_, 3 note A_, 2 - musicd7 + inc_octave note C_, 1 - musice6 160 + volume 160 musice8 4 note C_, 1 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note A#, 3 note A#, 1 - musicd7 - musice6 160 + inc_octave + volume 160 musice8 4 note D_, 1 rest 2 - musice6 146 + volume 146 musice8 7 note C_, 3 - musicd8 + dec_octave note A#, 3 music_ret Branch_f72fb: - musicdx 4 - musice6 160 + octave 4 + volume 160 note D_, 5 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note F_, 5 - musice6 55 + volume 55 note F_, 1 - musice6 160 + volume 160 note A_, 3 - Speed 1 + speed 1 note G_, 11 - musice6 55 + volume 55 note G_, 10 - Speed 7 - musicd7 - musice6 160 + speed 7 + inc_octave + volume 160 note C_, 3 - musicd8 - Speed 1 + dec_octave + speed 1 note A#, 11 - musice6 55 + volume 55 note A#, 10 - Speed 7 - musice6 160 + speed 7 + volume 160 note C#, 12 - musice6 55 + volume 55 note C#, 6 - musice6 160 + volume 160 note D#, 3 - Speed 1 + speed 1 note C#, 11 - musice6 55 + volume 55 note C#, 10 - musice6 160 - Speed 7 + volume 160 + speed 7 music_ret Music_Overworld_Ch2: ; f7334 (3d:7334) - Speed 7 - musice5 0 + speed 7 + duty 0 musicdc 17 - musicea 9 - musiceb 30 + vibrato_rate 9 + vibrato_delay 30 musice8 7 - musicdx 3 + octave 3 music_call Branch_f7535 MainLoop music_call Branch_f7535 - musice6 146 + volume 146 musice8 7 rest 3 note C_, 5 note C_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note C_, 4 note C_, 3 @@ -315,926 +315,926 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) rest 3 note C_, 5 note C_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note G_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note D_, 4 note D_, 3 note C_, 3 rest 3 - musicd8 + dec_octave note A#, 5 - musicd7 + inc_octave note D_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note C_, 4 note C_, 3 - musicd8 + dec_octave note A#, 3 rest 3 note A#, 5 - musicd7 + inc_octave note C#, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note C#, 4 - musicd8 + dec_octave note F_, 3 note A#, 3 rest 3 - musicd7 + inc_octave note C_, 3 note E_, 2 note C_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note G_, 1 musice8 7 - musice6 96 + volume 96 musice8 8 - musicdx 3 + octave 3 note E_, 3 note F_, 3 note G_, 3 musice8 7 note A#, 6 - musice6 146 + volume 146 musice8 7 - musicdx 3 + octave 3 note D_, 3 - musice6 96 + volume 96 musice8 8 - musicdx 3 + octave 3 note A_, 3 - musice6 146 + volume 146 musice8 7 - musicdx 2 + octave 2 note A_, 2 - musicd7 - musicd7 - musice6 144 + inc_octave + inc_octave + volume 144 musice8 4 note F_, 1 - musicd8 + dec_octave rest 2 - musice6 146 + volume 146 musice8 7 note D_, 4 note D_, 3 - musicd8 + dec_octave note A_, 3 rest 3 note A#, 3 - musicd7 + inc_octave note D_, 2 - musicd8 + dec_octave note A#, 3 - musice6 144 + volume 144 musice8 4 - musicd7 - musicd7 + inc_octave + inc_octave note F_, 1 rest 2 - musicd8 - musicd8 - musice6 146 + dec_octave + dec_octave + volume 146 musice8 7 note A#, 4 note A#, 3 note A#, 3 rest 3 note A#, 3 - musicd7 + inc_octave note D_, 2 - musicd8 + dec_octave note A#, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note A_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note A#, 6 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave note A#, 3 rest 3 - musicd7 + inc_octave note C_, 5 note C_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 2 - musice6 146 + volume 146 musice8 7 - musicd8 + dec_octave note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note G_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note D_, 4 - musice5 128 - musice6 95 + duty 2 + volume 95 musice8 8 - musicdx 4 + octave 4 note C_, 1 - musicd9 - musicd8 + no_fade + dec_octave note G_, 1 - musicd9 + no_fade note E_, 1 - musicd9 + no_fade note C_, 1 - musicd9 - musicd8 + no_fade + dec_octave note G_, 1 - musicd9 + no_fade note E_, 1 - musice5 0 - musice6 146 + duty 0 + volume 146 musice8 7 - musicdx 2 + octave 2 rest 3 note A#, 5 - musicd7 + inc_octave note D_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note C_, 4 note C_, 3 - musicd8 + dec_octave note A#, 3 rest 3 note A#, 5 - musicd7 + inc_octave note C#, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note C#, 4 note C#, 3 note C#, 3 rest 3 note C_, 3 - musicd8 + dec_octave note A_, 2 - musicd7 + inc_octave note C_, 3 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note G_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note C_, 4 note E_, 3 note C_, 3 rest 3 note D_, 6 - musicd8 + dec_octave note B_, 2 - musicd7 - musicd7 - musice6 144 + inc_octave + inc_octave + volume 144 musice8 4 note F_, 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note D_, 4 - musice6 96 + volume 96 musice8 8 - musicdx 4 + octave 4 note D_, 2 note E_, 1 note F_, 1 - musice6 39 + volume 39 note F_, 2 - musice6 96 + volume 96 note F_, 11 - musice6 146 + volume 146 musice8 7 - musicdx 4 - musice6 144 + octave 4 + volume 144 musice8 4 note F_, 1 rest 2 - musicd8 - musicd8 - musice6 146 + dec_octave + dec_octave + volume 146 musice8 7 note A#, 1 - musice6 96 + volume 96 musice8 8 - musicdx 3 + octave 3 note A#, 3 - musicd7 + inc_octave note F_, 3 note G_, 9 - musice6 146 + volume 146 musice8 7 - musicdx 3 + octave 3 note D_, 2 - musicd8 + dec_octave note A#, 3 - musicd7 - musicd7 - musice6 144 + inc_octave + inc_octave + volume 144 musice8 4 note F_, 1 musice8 8 - musice6 96 - musicdx 4 + volume 96 + octave 4 note C_, 5 - musice6 39 + volume 39 note C_, 1 - musicd8 - musice6 144 + dec_octave + volume 144 note A#, 5 - musice6 39 + volume 39 note A#, 1 - musice6 146 + volume 146 musice8 7 - musicdx 3 + octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note G_, 3 note G_, 3 - Speed 1 - musice6 144 + speed 1 + volume 144 musice8 8 - musicd7 + inc_octave note F_, 4 note C_, 3 - Speed 7 - musicd8 - musice6 146 + speed 7 + dec_octave + volume 146 musice8 7 note E_, 3 note G_, 2 - musicd7 - musice6 144 + inc_octave + volume 144 musice8 4 note F_, 1 - musice6 146 + volume 146 musice8 7 - musicd8 + dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 - musicd7 - musice6 144 + inc_octave + volume 144 musice8 4 note F_, 1 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note G_, 3 note G_, 3 - Speed 1 - musice6 144 + speed 1 + volume 144 musice8 8 - musicd7 + inc_octave note F_, 4 note C_, 3 - musicd8 - Speed 7 - musice6 146 + dec_octave + speed 7 + volume 146 musice8 7 note A_, 3 note G_, 2 - musicd7 - musice6 144 + inc_octave + volume 144 musice8 4 note F_, 1 EndMainLoop Branch_f7535: - musicdx 3 - musice6 146 + octave 3 + volume 146 musice8 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note G_, 3 note G_, 1 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 1 - musicd8 + dec_octave musice8 8 - Speed 1 - musicd7 + speed 1 + inc_octave note F_, 4 note C_, 3 - Speed 7 - musice6 146 + speed 7 + volume 146 musice8 7 - musicd8 + dec_octave note E_, 3 note G_, 2 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 - musicd8 + dec_octave rest 3 - musice6 146 + volume 146 musice8 8 note F_, 3 note F_, 2 note A_, 1 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 7 note G_, 3 note G_, 1 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 rest 1 - musicd8 + dec_octave musice8 8 - Speed 1 - musicd7 + speed 1 + inc_octave note F_, 4 note C_, 3 - Speed 7 - musice6 146 + speed 7 + volume 146 musice8 7 - musicd8 + dec_octave note A_, 3 note G_, 2 - musice6 144 + volume 144 musice8 4 - musicd7 + inc_octave note F_, 1 - musicd8 + dec_octave music_ret Music_Overworld_Ch3: ; f75a1 (3d:75a1) - Speed 7 + speed 7 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 64 musice8 7 - musicdx 1 + octave 1 music_call Branch_f77f8 note F_, 2 - musicd7 + inc_octave note C_, 1 MainLoop music_call Branch_f77f8 note F_, 3 music_call Branch_f7826 - musicdx 1 + octave 1 musice8 8 note F_, 1 note A#, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note C#, 2 - musicd8 + dec_octave musice8 8 note F_, 1 note A#, 1 rest 1 - musicd7 + inc_octave musice8 3 note F_, 2 rest 1 - musicd7 + inc_octave note C#, 1 - musicdx 1 + octave 1 musice8 8 note A#, 1 rest 1 - musicdx 3 + octave 3 musice8 7 note G_, 1 - musicdx 1 + octave 1 musice8 8 note A#, 1 rest 1 note F_, 1 - musicd7 + inc_octave musice8 3 note A#, 2 - musicd8 + dec_octave musice8 8 note A#, 1 - musicdx 3 + octave 3 musice8 3 note C#, 2 - musicdx 1 + octave 1 musice8 8 note F_, 1 note A_, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note E_, 2 - musicdx 1 + octave 1 musice8 8 note A_, 1 - musicdx 3 + octave 3 musice8 3 note G_, 2 musice8 7 note E_, 1 musice8 8 - musicd8 + dec_octave note E_, 1 rest 1 - musicd7 - musicd7 + inc_octave + inc_octave musice8 3 note E_, 1 - musicdx 1 + octave 1 musice8 8 note A_, 1 rest 1 - musicd7 + inc_octave note A_, 1 rest 2 - musicd8 + dec_octave note A_, 1 - musicd7 + inc_octave note A_, 1 note E_, 1 note C_, 1 - musicd8 + dec_octave note A_, 1 rest 1 - musicd7 + inc_octave note A_, 1 - musicd8 + dec_octave note D_, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 - musicdx 1 + octave 1 musice8 8 note A_, 1 - musicd7 + inc_octave note D_, 2 - musicd8 + dec_octave note A_, 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 - musicd7 + inc_octave note C_, 1 - musicdx 1 + octave 1 musice8 8 note D_, 2 - musicdx 3 + octave 3 musice8 3 note F_, 2 rest 1 - musicdx 1 + octave 1 musice8 8 note A_, 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 - musicdx 1 + octave 1 musice8 8 note D_, 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 musice8 8 - musicdx 1 + octave 1 note A_, 1 note G_, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 musice8 7 note D_, 1 - musicd8 + dec_octave musice8 8 note D_, 1 rest 1 musice8 3 - musicd7 + inc_octave note A#, 1 - musicdx 1 + octave 1 musice8 8 note G_, 1 rest 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 rest 1 - musicd8 + dec_octave musice8 8 note D_, 1 - musicd7 + inc_octave musice8 3 note F_, 2 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 musice8 8 - musicd8 + dec_octave note D_, 1 note C_, 2 rest 1 - musicd7 + inc_octave musice8 3 note D_, 2 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 musice8 7 note D_, 1 - musicdx 1 + octave 1 musice8 8 note C_, 1 rest 1 - musicdx 3 + octave 3 musice8 3 note F_, 1 - musicd8 + dec_octave musice8 8 note C_, 1 rest 1 - musicd7 + inc_octave musice8 3 note D_, 2 rest 1 - musicdx 1 + octave 1 musice8 8 note E_, 1 - musicd7 + inc_octave note C_, 1 rest 1 - musicd7 + inc_octave musice8 7 note F_, 1 musice8 3 note E_, 2 musice8 8 - musicdx 1 + octave 1 note E_, 1 music_call Branch_f7826 musice8 8 - musicdx 2 + octave 2 note C_, 1 note C#, 2 rest 1 - musicd7 + inc_octave musice8 3 note C#, 2 - musicdx 1 + octave 1 musice8 8 note G#, 1 - musicd7 + inc_octave note C#, 1 rest 1 - musicd7 + inc_octave musice8 3 note F_, 2 rest 1 - musicd7 + inc_octave note C#, 1 - musicdx 2 + octave 2 musice8 8 note C#, 1 rest 1 - musicd7 + inc_octave note G_, 1 - musicd8 + dec_octave musice8 8 note C#, 1 rest 1 - musicd8 + dec_octave note G#, 1 - musicdx 3 + octave 3 musice8 3 note G_, 2 - musicd8 + dec_octave musice8 8 note C#, 1 - musicd7 + inc_octave musice8 3 note F_, 2 - musicdx 1 + octave 1 musice8 8 note G#, 1 - musicd7 + inc_octave note C_, 2 rest 1 - musicd7 + inc_octave musice8 3 note E_, 2 - musicd8 + dec_octave musice8 8 note G_, 1 - musicd7 + inc_octave musice8 3 note C_, 2 musice8 7 note E_, 1 - musicd8 + dec_octave musice8 8 note E_, 1 rest 1 - musicdx 4 + octave 4 musice8 3 note E_, 1 - musicdx 2 + octave 2 musice8 8 note C_, 1 rest 1 - musicd7 + inc_octave musice8 3 note E_, 2 rest 1 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicdx 3 + octave 3 musice8 3 note G_, 2 - musicd8 + dec_octave musice8 8 note C_, 1 - musicd7 + inc_octave musice8 3 note E_, 2 - musicdx 1 + octave 1 musice8 8 note G_, 1 note B_, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 - musicd8 + dec_octave musice8 8 note F_, 1 note B_, 2 note F_, 1 - musicd7 + inc_octave musice8 3 note D_, 2 - musicd7 + inc_octave note D_, 1 - musicdx 1 + octave 1 musice8 8 note B_, 2 - musicdx 3 + octave 3 musice8 3 note F_, 2 rest 1 - musicd8 + dec_octave musice8 8 note F_, 1 note B_, 2 note F_, 1 - musicd8 + dec_octave note B_, 2 rest 1 note A#, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 - musicd8 + dec_octave musice8 8 note F_, 1 note A#, 2 note F_, 1 - musicd7 + inc_octave musice8 3 note F_, 2 - musicd7 + inc_octave note D_, 1 - musicdx 1 + octave 1 musice8 8 note A#, 1 rest 1 - musicdx 3 + octave 3 musice8 7 note D_, 1 - musicdx 1 + octave 1 musice8 8 note A#, 1 rest 2 note A#, 2 - musicd7 + inc_octave note F_, 1 note A#, 1 rest 2 note C_, 2 rest 1 - musicd7 + inc_octave musice8 3 note D_, 2 - musicdx 1 + octave 1 musice8 8 note G_, 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 musice8 7 note D_, 1 - musicdx 1 + octave 1 musice8 8 note C_, 1 rest 1 - musicdx 4 + octave 4 musice8 3 note D_, 1 - musicdx 2 + octave 2 musice8 8 note C_, 1 rest 1 - musicd7 + inc_octave musice8 3 note D_, 2 rest 1 - musicdx 1 + octave 1 musice8 8 note E_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note G_, 1 note E_, 1 note C_, 1 rest 1 note E_, 1 note F_, 3 - musicdx 3 + octave 3 musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note C_, 1 - musicd7 + inc_octave musice8 5 note F_, 2 note A_, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave rest 1 note A#, 2 rest 1 note A#, 1 - musicd7 + inc_octave note D_, 1 - musicd8 + dec_octave rest 2 note G_, 2 - musicd8 + dec_octave musice8 8 note C_, 1 - musicd7 + inc_octave musice8 5 note A#, 2 - musicd7 + inc_octave note C_, 1 - musicdx 1 + octave 1 musice8 8 note F_, 3 - musicdx 4 + octave 4 musice8 3 note C_, 2 - musicdx 2 + octave 2 musice8 8 note C_, 1 - musicd7 + inc_octave musice8 5 note A_, 2 - musicd7 + inc_octave note C_, 1 note C_, 1 rest 1 - musicd8 + dec_octave note A#, 2 rest 1 note A#, 1 - musicd7 + inc_octave note D_, 1 rest 2 note C_, 2 - musicdx 2 + octave 2 musice8 8 note C_, 1 - musicd7 + inc_octave musice8 5 note A#, 2 - musicd8 + dec_octave musice8 8 note C_, 1 EndMainLoop Branch_f77f8: - musicdx 1 + octave 1 note F_, 3 - musicdx 3 + octave 3 musice8 3 note A_, 2 - musicd8 + dec_octave musice8 8 note C_, 1 note F_, 2 @@ -1247,16 +1247,16 @@ Branch_f77f8: note C_, 1 note F_, 2 note C_, 1 - musicd8 + dec_octave note F_, 2 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note F_, 3 - musicdx 4 + octave 4 musice8 3 note C_, 2 - musicdx 2 + octave 2 musice8 8 note C_, 1 note F_, 2 @@ -1269,75 +1269,75 @@ Branch_f77f8: note C_, 1 note F_, 2 note C_, 1 - musicd8 + dec_octave music_ret Branch_f7826: - musicdx 1 + octave 1 note F_, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note F_, 2 - musicd8 + dec_octave musice8 8 note C_, 1 note F_, 1 rest 1 - musicd7 + inc_octave musice8 3 note F_, 2 rest 1 - musicd7 + inc_octave note C_, 1 - musicdx 1 + octave 1 musice8 8 note F_, 1 rest 1 - musicdx 3 + octave 3 musice8 7 note G_, 1 - musicdx 1 + octave 1 musice8 8 note F_, 1 rest 1 note C_, 1 - musicdx 3 + octave 3 musice8 3 note G_, 2 - musicdx 1 + octave 1 musice8 8 note F_, 1 - musicdx 3 + octave 3 musice8 7 note F_, 2 - musicdx 1 + octave 1 musice8 8 note G_, 1 note A_, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note E_, 2 - musicd8 + dec_octave musice8 8 note E_, 1 note A_, 1 rest 1 - musicd7 + inc_octave musice8 3 note E_, 2 rest 1 - musicd7 + inc_octave note C_, 1 - musicdx 1 + octave 1 musice8 8 note A_, 1 rest 1 - musicdx 3 + octave 3 musice8 7 note E_, 1 - musicdx 1 + octave 1 musice8 8 Loop 2 note A_, 1 @@ -1348,47 +1348,47 @@ Branch_f7826: rest 1 note A#, 2 rest 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 - musicd8 + dec_octave musice8 8 note F_, 1 note A#, 1 rest 1 - musicd7 + inc_octave musice8 3 note F_, 2 rest 1 - musicd7 + inc_octave note D_, 1 - musicdx 1 + octave 1 musice8 8 note A#, 1 rest 1 - musicdx 3 + octave 3 musice8 7 note D_, 1 - musicdx 1 + octave 1 musice8 8 note A#, 1 rest 1 note F_, 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 - musicdx 1 + octave 1 musice8 8 note A#, 1 - musicdx 3 + octave 3 musice8 3 note D_, 2 music_ret Music_Overworld_Ch4: ; f78af (3d:78af) - Speed 7 - musicdx 1 + speed 7 + octave 1 music_call Branch_f78ee music_call Branch_f78fb MainLoop diff --git a/music/pausemenu.asm b/music/pausemenu.asm index 8a4d1a8..9a9ea2f 100644 --- a/music/pausemenu.asm +++ b/music/pausemenu.asm @@ -1,65 +1,65 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) - Speed 7 + speed 7 musicdc 17 musice8 8 - musice5 128 + duty 2 MainLoop - musice6 112 + volume 112 Loop 4 rest 16 EndLoop - Speed 1 - musicdx 6 + speed 1 + octave 6 note C_, 4 - musicd8 + dec_octave rest 3 note B_, 4 - musicd7 - musice6 55 + inc_octave + volume 55 note C_, 3 - musicd8 - musice6 112 + dec_octave + volume 112 note G_, 4 - musice6 55 + volume 55 note B_, 3 - musice6 112 + volume 112 note D_, 4 - musice6 55 + volume 55 note G_, 3 music_call Branch_f6c24 music_call Branch_f6c60 - musice6 112 - musicdx 6 + volume 112 + octave 6 note C_, 4 - musicd8 - musice6 55 + dec_octave + volume 55 note E_, 3 - musice6 112 + volume 112 note B_, 4 - musicd7 - musice6 55 + inc_octave + volume 55 note C_, 3 - musicd8 - musice6 112 + dec_octave + volume 112 note G_, 4 - musice6 55 + volume 55 note B_, 3 - musice6 112 + volume 112 note D_, 4 - musice6 55 + volume 55 note G_, 3 music_call Branch_f6c24 music_call Branch_f6c60 - musicdx 6 - musice6 96 + octave 6 + volume 96 note C_, 4 - musicd8 - musice6 55 + dec_octave + volume 55 note E_, 3 music_call Branch_f6ce9 music_call Branch_f6c80 Loop 3 - musicdx 6 + octave 6 musice8 4 note C_, 1 music_call Branch_f6ce9 @@ -70,139 +70,139 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) Branch_f6c24: Loop 3 - musicdx 6 - musice6 112 + octave 6 + volume 112 note C_, 4 - musicd8 - musice6 55 + dec_octave + volume 55 note D_, 3 - musice6 112 + volume 112 note B_, 4 - musicd7 - musice6 55 + inc_octave + volume 55 note C_, 3 - musicd8 - musice6 112 + dec_octave + volume 112 note G_, 4 - musice6 55 + volume 55 note B_, 3 - musice6 112 + volume 112 note D_, 4 - musice6 55 + volume 55 note G_, 3 EndLoop - musicd7 - musice6 112 + inc_octave + volume 112 note C_, 4 - musicd8 - musice6 55 + dec_octave + volume 55 note D_, 3 - musice6 112 + volume 112 note B_, 4 - musicd7 - musice6 55 + inc_octave + volume 55 note C_, 3 - musicd8 - musice6 112 + dec_octave + volume 112 note G_, 4 - musice6 55 + volume 55 note B_, 3 - musice6 112 + volume 112 note E_, 4 - musice6 55 + volume 55 note G_, 3 music_ret Branch_f6c60: Loop 3 - musicdx 6 - musice6 112 + octave 6 + volume 112 note C_, 4 - musicd8 - musice6 55 + dec_octave + volume 55 note E_, 3 - musice6 112 + volume 112 note B_, 4 - musicd7 - musice6 55 + inc_octave + volume 55 note C_, 3 - musicd8 - musice6 112 + dec_octave + volume 112 note G_, 4 - musice6 55 + volume 55 note B_, 3 - musice6 112 + volume 112 note E_, 4 - musice6 55 + volume 55 note G_, 3 EndLoop music_ret Branch_f6c80: - musicdx 6 + octave 6 musice8 4 note C_, 1 - musicdx 3 - musice6 112 + octave 3 + volume 112 musice8 8 - Speed 1 + speed 1 note C_, 4 - musice6 39 + volume 39 note C_, 3 - musice6 96 - Speed 7 - musicdx 5 + volume 96 + speed 7 + octave 5 musice8 4 note G_, 1 note E_, 1 - musicdx 3 + octave 3 musice8 8 - musice6 112 - Speed 1 + volume 112 + speed 1 note E_, 4 - musice6 39 + volume 39 note E_, 3 - Speed 7 - musice6 96 - musicdx 5 + speed 7 + volume 96 + octave 5 musice8 4 note B_, 1 note G_, 1 - musicd8 - musice6 112 + dec_octave + volume 112 musice8 8 - Speed 1 + speed 1 note C_, 4 - musice6 39 + volume 39 note C_, 3 - musice6 96 - Speed 7 - musicdx 6 + volume 96 + speed 7 + octave 6 musice8 4 note C_, 1 - musicdx 3 + octave 3 musice8 8 - musice6 112 - Speed 1 + volume 112 + speed 1 note C_, 4 - musice6 39 + volume 39 note C_, 3 - Speed 7 - musicdx 5 - musice6 96 + speed 7 + octave 5 + volume 96 musice8 4 note G_, 1 note E_, 1 - musice6 112 - musicdx 3 + volume 112 + octave 3 musice8 8 - Speed 1 + speed 1 note E_, 4 - musice6 39 + volume 39 note E_, 3 - Speed 7 - musice6 96 - musicdx 5 + speed 7 + volume 96 + octave 5 musice8 4 note B_, 1 note G_, 1 @@ -210,67 +210,67 @@ Branch_f6c80: music_ret Branch_f6ce9: - musicdx 2 - Speed 1 + octave 2 + speed 1 musice8 8 - musice6 112 + volume 112 note B_, 4 - musice6 39 + volume 39 note B_, 3 - Speed 7 - musice6 96 - musicdx 5 + speed 7 + volume 96 + octave 5 musice8 4 note G_, 1 note D_, 1 - musicdx 3 - musice6 112 + octave 3 + volume 112 musice8 8 - Speed 1 + speed 1 note D_, 4 - musice6 39 + volume 39 note D_, 3 - Speed 7 - musice6 96 - musicdx 5 + speed 7 + volume 96 + octave 5 musice8 4 note B_, 1 note G_, 1 - musice6 112 - musicdx 3 + volume 112 + octave 3 musice8 8 - Speed 1 + speed 1 note B_, 4 - musice6 39 + volume 39 note B_, 3 - musice6 96 - Speed 7 - musicdx 6 + volume 96 + speed 7 + octave 6 musice8 4 note C_, 1 - musice6 112 - musicdx 2 + volume 112 + octave 2 musice8 8 - Speed 1 + speed 1 note B_, 4 - musice6 39 + volume 39 note B_, 3 - Speed 7 - musice6 96 - musicdx 5 + speed 7 + volume 96 + octave 5 musice8 4 note G_, 1 note D_, 1 - musice6 112 - musicdx 3 + volume 112 + octave 3 musice8 8 - Speed 1 + speed 1 note D_, 4 - musice6 39 + volume 39 note D_, 3 - Speed 7 - musice6 96 - musicdx 5 + speed 7 + volume 96 + octave 5 musice8 4 note B_, 1 note G_, 1 @@ -279,274 +279,274 @@ Branch_f6ce9: Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) - Speed 7 + speed 7 musicdc 17 musice8 8 - musice5 128 + duty 2 MainLoop - musice6 128 + volume 128 Loop 7 rest 16 EndLoop - musicdx 5 + octave 5 rest 8 - Speed 1 + speed 1 Loop 4 note B_, 4 note G_, 3 note E_, 4 note C_, 3 - musicd8 + dec_octave EndLoop - Speed 7 + speed 7 Loop 4 - musicdx 1 - musice6 208 + octave 1 + volume 208 note G_, 1 - musicdx 3 - musice6 112 - Speed 1 + octave 3 + volume 112 + speed 1 note D_, 4 - musice6 39 + volume 39 note D_, 3 - musice6 208 - Speed 7 - musicdx 1 + volume 208 + speed 7 + octave 1 musice8 6 note G_, 1 musice8 4 note G_, 1 - musicdx 3 + octave 3 musice8 8 - musice6 112 - Speed 1 + volume 112 + speed 1 note F#, 4 - musice6 39 + volume 39 note F#, 3 - musicd8 - musice6 208 - Speed 7 + dec_octave + volume 208 + speed 7 note D_, 1 note G_, 1 - musicdx 4 - musice6 112 - Speed 1 + octave 4 + volume 112 + speed 1 note F#, 4 - musice6 39 + volume 39 note F#, 3 - Speed 7 - musicdx 1 - musice6 208 + speed 7 + octave 1 + volume 208 musice8 8 note G_, 1 - musicdx 3 - musice6 112 - Speed 1 + octave 3 + volume 112 + speed 1 note D_, 4 - musice6 39 + volume 39 note D_, 3 - Speed 7 - musice6 208 - musicdx 1 + speed 7 + volume 208 + octave 1 musice8 6 note G_, 1 musice8 4 note G_, 1 - musicdx 3 + octave 3 musice8 8 - Speed 1 + speed 1 note F#, 4 - musice6 39 + volume 39 note F#, 3 - Speed 7 - musicdx 1 - musice6 208 + speed 7 + octave 1 + volume 208 note B_, 1 - musicd7 + inc_octave note C_, 1 note C#, 1 - musicd8 + dec_octave note D_, 1 - musicdx 3 - musice6 112 - Speed 1 + octave 3 + volume 112 + speed 1 note E_, 4 - musice6 39 + volume 39 note E_, 3 - musice6 208 - Speed 7 - musicdx 1 + volume 208 + speed 7 + octave 1 musice8 6 note D_, 1 musice8 4 note D_, 1 - musicdx 3 + octave 3 musice8 8 - Speed 1 + speed 1 note G_, 4 - musice6 39 + volume 39 note G_, 3 - Speed 7 - musicd8 - musice6 208 + speed 7 + dec_octave + volume 208 note C_, 1 note D_, 1 - musicdx 4 - musice6 112 - Speed 1 + octave 4 + volume 112 + speed 1 note G_, 4 - musice6 39 + volume 39 note G_, 3 - Speed 7 - musicdx 1 - musice6 208 + speed 7 + octave 1 + volume 208 musice8 8 note D_, 1 - musicdx 3 - musice6 112 - Speed 1 + octave 3 + volume 112 + speed 1 note E_, 4 - musice6 39 + volume 39 note E_, 3 - Speed 7 - musice6 208 + speed 7 + volume 208 musice8 6 - musicdx 1 + octave 1 note D_, 1 musice8 4 note D_, 1 - musicdx 3 + octave 3 musice8 8 - Speed 1 + speed 1 note G_, 4 - musice6 39 + volume 39 note G_, 3 - Speed 7 - musicdx 1 - musice6 208 + speed 7 + octave 1 + volume 208 note C_, 1 note C#, 1 - musicd7 + inc_octave note D_, 1 EndLoop EndMainLoop Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) - Speed 1 - musice7 3 + speed 1 + duty3 3 musicdc 17 - musice6 64 + volume 64 musice9 96 musice8 4 - musicdx 4 + octave 4 note G_, 7 musice8 8 note F#, 4 - musice6 96 + volume 96 note G_, 3 - musice6 64 + volume 64 note D_, 4 - musice6 96 + volume 96 note F#, 3 - musicd8 - musice6 64 + dec_octave + volume 64 note B_, 4 - musicd7 - musice6 96 + inc_octave + volume 96 note D_, 3 MainLoop - musicdx 4 + octave 4 Loop 3 - musice6 64 + volume 64 note G_, 4 - musicd8 - musice6 96 + dec_octave + volume 96 note B_, 3 - musicd7 - musice6 64 + inc_octave + volume 64 note F#, 4 - musice6 96 + volume 96 note G_, 3 - musice6 64 + volume 64 note D_, 4 - musice6 96 + volume 96 note F#, 3 - musicd8 - musice6 64 + dec_octave + volume 64 note B_, 4 - musicd7 - musice6 96 + inc_octave + volume 96 note D_, 3 EndLoop - musice6 64 + volume 64 note G_, 4 - musicd8 - musice6 96 + dec_octave + volume 96 note B_, 3 - musicd7 - musice6 64 + inc_octave + volume 64 note E_, 4 - musice6 96 + volume 96 note G_, 3 - musice6 64 + volume 64 note C_, 4 - musice6 96 + volume 96 note E_, 3 - musicd8 - musice6 64 + dec_octave + volume 64 note A_, 4 - musicd7 - musice6 96 + inc_octave + volume 96 note C_, 3 Loop 3 - musice6 64 + volume 64 note G_, 4 - musicd8 - musice6 96 + dec_octave + volume 96 note A_, 3 - musicd7 - musice6 64 + inc_octave + volume 64 note E_, 4 - musice6 96 + volume 96 note G_, 3 - musice6 64 + volume 64 note C_, 4 - musice6 96 + volume 96 note E_, 3 - musicd8 - musice6 64 + dec_octave + volume 64 note A_, 4 - musicd7 - musice6 96 + inc_octave + volume 96 note C_, 3 EndLoop - musice6 64 + volume 64 note G_, 4 - musicd8 - musice6 96 + dec_octave + volume 96 note A_, 3 - musicd7 - musice6 64 + inc_octave + volume 64 note F#, 4 - musice6 96 + volume 96 note G_, 3 - musice6 64 + volume 64 note D_, 4 - musice6 96 + volume 96 note F#, 3 - musicd8 - musice6 64 + dec_octave + volume 64 note B_, 4 - musicd7 - musice6 96 + inc_octave + volume 96 note D_, 3 EndMainLoop Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) - Speed 7 - musicdx 1 + speed 7 + octave 1 MainLoop Loop 2 Loop 7 @@ -571,10 +571,10 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) note snare1, 1 note snare3, 1 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 Loop 8 note snare1, 1 EndLoop diff --git a/music/pcmainmenu.asm b/music/pcmainmenu.asm index 4c7956b..e9482ca 100644 --- a/music/pcmainmenu.asm +++ b/music/pcmainmenu.asm @@ -1,250 +1,250 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) - Speed 7 + speed 7 musicdc 17 musice8 8 - musicdx 3 - musice5 128 + octave 3 + duty 2 MainLoop music_call Branch_f90c2 rest 4 - musicd8 - musice5 64 + dec_octave + duty 1 musice8 5 - musice6 97 + volume 97 note F_, 1 rest 1 - musice5 128 + duty 2 musice8 8 - musice6 180 + volume 180 note A_, 1 - musice6 55 + volume 55 note A_, 1 rest 2 - musicd7 - musice6 180 + inc_octave + volume 180 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musicd8 - musice5 64 + dec_octave + duty 1 musice8 5 - musice6 97 + volume 97 note F_, 1 rest 1 - musice5 128 + duty 2 musice8 8 - musice6 180 + volume 180 note B_, 1 - musice6 55 + volume 55 note B_, 1 music_call Branch_f90c2 rest 4 - musicd8 - musice5 64 + dec_octave + duty 1 musice8 5 - musice6 97 + volume 97 note F_, 1 rest 1 - musicd7 - musice5 128 + inc_octave + duty 2 musice8 8 - musice6 180 + volume 180 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 2 - musice6 180 + volume 180 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musice5 64 + duty 1 musice8 5 - musice6 97 - musicd8 + volume 97 + dec_octave note F_, 1 rest 1 - musicd7 - musice5 128 + inc_octave + duty 2 musice8 8 - musice6 180 + volume 180 note D_, 1 - musice6 55 + volume 55 note D_, 1 EndMainLoop Branch_f90c2: - musicdx 3 + octave 3 rest 4 - musice5 64 - musice6 97 + duty 1 + volume 97 musice8 5 note G_, 1 rest 3 musice8 8 - musice5 128 - musice6 180 + duty 2 + volume 180 note B_, 2 - musicd7 + inc_octave note D_, 1 - musice6 39 + volume 39 note D_, 1 - musicd8 - musice5 64 - musice6 97 + dec_octave + duty 1 + volume 97 musice8 5 note G_, 1 rest 1 - musicd7 - musice5 128 + inc_octave + duty 2 musice8 8 - musice6 180 + volume 180 note C_, 1 - musice6 55 + volume 55 note C_, 1 music_ret Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) - Speed 7 + speed 7 musicdc 17 musice8 8 - musicdx 3 - musice5 128 + octave 3 + duty 2 MainLoop music_call Branch_f915e rest 4 - musicd7 - musice5 64 + inc_octave + duty 1 musice8 5 - musice6 97 + volume 97 note C_, 1 rest 1 - musicd8 - musice5 128 + dec_octave + duty 2 musice8 8 - musice6 132 + volume 132 note F_, 1 - musice6 39 + volume 39 note F_, 1 rest 2 - musice6 132 + volume 132 note A_, 1 - musice6 39 + volume 39 note A_, 1 - musice5 64 + duty 1 musice8 5 - musice6 97 - musicd7 + volume 97 + inc_octave note C_, 1 rest 1 - musicd8 - musice5 128 + dec_octave + duty 2 musice8 8 - musice6 132 + volume 132 note G_, 1 - musice6 39 + volume 39 note G_, 1 music_call Branch_f915e rest 4 - musicd7 - musice5 64 + inc_octave + duty 1 musice8 5 - musice6 97 + volume 97 note C_, 1 rest 1 - musice5 128 + duty 2 musice8 8 - musice6 132 + volume 132 note C_, 1 - musice6 39 + volume 39 note C_, 1 rest 2 - musicd8 - musice6 132 + dec_octave + volume 132 note A_, 1 - musice6 39 + volume 39 note A_, 1 - musice5 64 - musicd7 - musice6 97 + duty 1 + inc_octave + volume 97 musice8 5 note C_, 1 rest 1 - musicd8 - musice5 128 + dec_octave + duty 2 musice8 8 - musice6 132 + volume 132 note B_, 1 - musice6 39 + volume 39 note B_, 1 EndMainLoop Branch_f915e: - musicdx 4 + octave 4 rest 4 - musice5 64 + duty 1 musice8 5 - musice6 97 + volume 97 note D_, 1 rest 3 - musice5 128 + duty 2 musice8 8 - musicd8 - musice6 132 + dec_octave + volume 132 note G_, 2 note B_, 1 - musice6 39 + volume 39 note B_, 1 - musicd7 - musice5 64 + inc_octave + duty 1 musice8 5 - musice6 97 + volume 97 note D_, 1 rest 1 - musicd8 - musice5 128 + dec_octave + duty 2 musice8 8 - musice6 132 + volume 132 note A_, 1 - musice6 39 + volume 39 note A_, 1 music_ret Music_PCMainMenu_Ch3: ; f9189 (3e:5189) - Speed 7 - musice6 32 + speed 7 + volume 32 musicdc 17 - musice7 1 + duty3 1 musice8 7 musice9 0 MainLoop - musicdx 1 + octave 1 musice8 7 note G_, 1 rest 1 musice8 8 note G_, 1 rest 1 - Speed 1 + speed 1 note A#, 4 - musicd9 + no_fade note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 1 rest 1 musice8 4 - musicd7 + inc_octave note C_, 1 rest 1 note C_, 1 musice8 8 note C#, 2 note D_, 2 - musicd8 + dec_octave note G_, 1 - musicd9 + no_fade note F#, 1 musice8 7 note F_, 1 @@ -252,12 +252,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) musice8 8 note F_, 1 rest 1 - Speed 1 + speed 1 note G#, 4 - musicd9 + no_fade note A_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note A_, 1 rest 1 musice8 4 @@ -266,11 +266,11 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note A#, 1 musice8 8 note B_, 2 - musicd7 + inc_octave note C_, 2 - musicd8 + dec_octave note F_, 1 - musicd9 + no_fade note F#, 1 musice8 7 note G_, 1 @@ -278,25 +278,25 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) musice8 8 note G_, 1 rest 1 - Speed 1 + speed 1 note A#, 4 - musicd9 + no_fade note B_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note B_, 1 rest 1 musice8 4 - musicd7 + inc_octave note C_, 1 rest 1 note C_, 1 musice8 8 note C#, 2 note D_, 2 - musicd8 + dec_octave note G_, 1 - musicd9 + no_fade note F#, 1 musice8 7 note F_, 1 @@ -304,46 +304,46 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) musice8 8 note F_, 1 rest 1 - Speed 1 + speed 1 note B_, 4 - musicd9 - musicd7 + no_fade + inc_octave note C_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note C_, 1 rest 1 musice8 8 - Speed 1 + speed 1 note F#, 4 - musicd9 + no_fade note G_, 3 - musicd9 - Speed 7 + no_fade + speed 7 note G_, 1 musice8 4 note F_, 1 musice8 8 note C_, 2 note F_, 2 - Speed 1 + speed 1 note C_, 3 - musicd9 - musicd8 + no_fade + dec_octave note B_, 3 - musicd9 + no_fade note A#, 3 - musicd9 + no_fade note A_, 3 - musicd9 + no_fade note G#, 2 - Speed 7 + speed 7 EndMainLoop Music_PCMainMenu_Ch4: ; f922b (3e:522b) - Speed 7 - musicdx 1 + speed 7 + octave 1 MainLoop Loop 7 music_call Branch_f9248 @@ -355,10 +355,10 @@ Music_PCMainMenu_Ch4: ; f922b (3e:522b) EndLoop music_call Branch_f9248 note snare4, 1 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 - Speed 7 + speed 7 note snare1, 2 note snare1, 1 note snare1, 1 diff --git a/music/pokemondome.asm b/music/pokemondome.asm index 2fcc3d7..369c291 100644 --- a/music/pokemondome.asm +++ b/music/pokemondome.asm @@ -1,17 +1,17 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) - Speed 7 + speed 7 musicdc 17 - musicea 9 - musiceb 20 + vibrato_rate 9 + vibrato_delay 20 musice8 8 - musicdx 2 - musice5 0 - musice6 160 - Speed 1 + octave 2 + duty 0 + volume 160 + speed 1 note G_, 5 note A_, 5 note B_, 4 - musicd7 + inc_octave note C_, 5 note D_, 5 note E_, 4 @@ -25,143 +25,143 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G_, 5 note A_, 4 note B_, 5 - musicd7 + inc_octave note C_, 5 note D_, 4 - musicd8 + dec_octave note B_, 5 - musicd7 + inc_octave note C_, 5 note D_, 4 note E_, 5 note F_, 5 note G_, 4 - musice5 64 - musice6 128 - musicd8 - Speed 1 + duty 1 + volume 128 + dec_octave + speed 1 note C_, 11 - musice6 55 + volume 55 note C_, 3 - musice6 128 + volume 128 note C_, 11 - musice6 55 + volume 55 note C_, 10 rest 7 - musice6 128 + volume 128 note C_, 4 - musice6 55 + volume 55 note C_, 3 - musice6 128 + volume 128 note C_, 4 - musice6 55 + volume 55 note C_, 3 - musice6 128 + volume 128 note C_, 11 - musice6 55 + volume 55 note C_, 3 - musice6 128 + volume 128 note C_, 11 - musice6 55 + volume 55 note C_, 10 - Speed 7 + speed 7 rest 3 - musice6 128 - Speed 1 + volume 128 + speed 1 note D_, 11 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 11 - musice6 55 + volume 55 note D_, 10 rest 7 - musice6 128 + volume 128 note D_, 4 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 4 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 11 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 11 - musice6 55 + volume 55 note D_, 3 MainLoop - Speed 7 - musice5 64 - musice6 164 - musicdx 2 + speed 7 + duty 1 + volume 164 + octave 2 note G_, 4 - musicd7 - musice5 64 - musice6 128 - Speed 1 + inc_octave + duty 1 + volume 128 + speed 1 note E_, 11 - musice6 55 + volume 55 note E_, 3 - musice6 128 - Speed 1 + volume 128 + speed 1 note E_, 11 - musice6 55 + volume 55 note E_, 10 rest 7 - musice6 128 + volume 128 note E_, 4 - musice6 55 + volume 55 note E_, 3 - musice6 128 + volume 128 note E_, 4 - musice6 55 + volume 55 note E_, 3 - musice6 128 + volume 128 note E_, 11 - musice6 55 + volume 55 note E_, 3 - musice6 128 + volume 128 note E_, 11 - musice6 55 + volume 55 note E_, 10 - Speed 7 + speed 7 rest 3 - musice6 128 - Speed 1 + volume 128 + speed 1 note D_, 11 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 11 - musice6 55 + volume 55 note D_, 10 rest 7 - Speed 1 - musice6 128 + speed 1 + volume 128 note D_, 4 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 4 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 11 - musice6 55 + volume 55 note D_, 3 - musice6 128 + volume 128 note D_, 11 - musice6 55 + volume 55 note D_, 3 - musice5 0 - musice6 160 - musicd8 - Speed 1 + duty 0 + volume 160 + dec_octave + speed 1 note B_, 4 - musicd7 + inc_octave note C_, 3 note D_, 4 note E_, 3 @@ -169,158 +169,158 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G_, 3 note A_, 4 note B_, 3 - Speed 7 - musicd7 + speed 7 + inc_octave note C_, 12 - musicd8 + dec_octave note G_, 1 - musice6 55 + volume 55 note G_, 1 rest 1 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 1 note D_, 10 - musice6 55 + volume 55 note D_, 2 - musice6 160 + volume 160 note G_, 3 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note F_, 10 - musice6 55 + volume 55 note F_, 2 - musice6 160 + volume 160 note C_, 3 - musice6 55 + volume 55 note C_, 1 - musice6 160 + volume 160 note F_, 10 note E_, 1 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note D_, 3 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note E_, 12 - musicd8 + dec_octave note G_, 1 - musice6 55 + volume 55 note G_, 1 rest 1 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 1 note D_, 8 - musicd8 + dec_octave note A_, 4 - musicd7 + inc_octave note D_, 3 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note C_, 14 - musice6 55 + volume 55 note C_, 2 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 10 - musice6 55 + volume 55 note B_, 2 - musice6 160 + volume 160 note G_, 4 note A_, 12 note B_, 1 - musice6 55 + volume 55 note B_, 2 - musicd7 - musice6 160 + inc_octave + volume 160 note C_, 1 note D_, 8 note E_, 4 note F_, 4 note G_, 8 - musicd9 + no_fade note G_, 8 - musicd9 + no_fade note G_, 8 - musice6 55 + volume 55 note G_, 2 - musice6 160 + volume 160 note F_, 2 note E_, 2 - musice6 55 + volume 55 note E_, 1 - musice6 160 - Speed 1 + volume 160 + speed 1 note E_, 5 - musice6 55 + volume 55 note E_, 2 - Speed 7 - musice6 160 + speed 7 + volume 160 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 1 - musicd7 + inc_octave note C_, 8 note G_, 1 - musice6 55 + volume 55 note G_, 2 - musice6 160 + volume 160 note F_, 1 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 - musicd8 - musice6 160 + dec_octave + volume 160 note A_, 1 - musicd7 + inc_octave note C_, 8 note G_, 1 - musice6 55 + volume 55 note G_, 2 - musice6 160 + volume 160 note F_, 1 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 - musicd8 - musice6 160 + dec_octave + volume 160 note G#, 1 - musicd7 + inc_octave note C_, 12 - musicd9 + no_fade note C_, 8 note D_, 8 note C_, 8 - musicd9 + no_fade note C_, 8 - musicd9 + no_fade note C_, 12 EndMainLoop Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) - Speed 7 + speed 7 musicdc 17 - musicea 9 - musiceb 20 + vibrato_rate 9 + vibrato_delay 20 musice8 8 - musicdx 1 - musice5 0 - musice6 128 - Speed 1 + octave 1 + duty 0 + volume 128 + speed 1 note B_, 5 - musicd7 + inc_octave note C_, 5 note D_, 4 note E_, 5 @@ -331,12 +331,12 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note G_, 4 note A_, 5 note B_, 5 - musicd7 + inc_octave note C_, 4 - musicd8 + dec_octave note A_, 5 note B_, 5 - musicd7 + inc_octave note C_, 4 note D_, 5 note E_, 5 @@ -348,99 +348,99 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note A_, 5 note B_, 4 MainLoop - musice5 64 - musice6 112 - musicdx 3 - Speed 1 + duty 1 + volume 112 + octave 3 + speed 1 note E_, 11 - musice6 55 + volume 55 note E_, 3 - musice6 112 + volume 112 note E_, 11 - musice6 55 + volume 55 note E_, 10 rest 7 - musice6 112 + volume 112 note E_, 4 - musice6 55 + volume 55 note E_, 3 - musice6 112 + volume 112 note E_, 4 - musice6 55 + volume 55 note E_, 3 - musice6 112 + volume 112 note E_, 11 - musice6 55 + volume 55 note E_, 3 - musice6 112 + volume 112 note E_, 11 - musice6 55 + volume 55 note E_, 10 - Speed 7 + speed 7 rest 3 music_call Branch_f9554 - Speed 7 + speed 7 rest 4 - musice6 112 - Speed 1 + volume 112 + speed 1 note G_, 11 - musice6 55 + volume 55 note G_, 3 - musice6 112 + volume 112 note G_, 11 - musice6 55 + volume 55 note G_, 10 rest 7 - musice6 112 + volume 112 note G_, 4 - musice6 55 + volume 55 note G_, 3 - musice6 112 + volume 112 note G_, 4 - musice6 55 + volume 55 note G_, 3 - musice6 112 + volume 112 note G_, 11 - musice6 55 + volume 55 note G_, 3 - musice6 112 + volume 112 note G_, 11 - musice6 55 + volume 55 note G_, 10 - Speed 7 + speed 7 rest 3 music_call Branch_f9554 - musice5 0 - musice6 128 - musicd8 - Speed 1 + duty 0 + volume 128 + dec_octave + speed 1 note G_, 4 note A_, 3 note B_, 4 - musicd7 + inc_octave note C_, 3 note D_, 4 note E_, 3 note F_, 4 note F#, 3 - Speed 7 + speed 7 note G_, 10 note F_, 1 rest 1 note E_, 1 - musice6 39 + volume 39 note E_, 1 rest 1 - musice6 112 + volume 112 note G_, 1 note G_, 10 note A_, 2 note B_, 2 note G_, 2 - musicd7 + inc_octave note C_, 10 rest 2 - musicd8 + dec_octave note A_, 3 rest 1 note G#, 10 @@ -449,31 +449,31 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note G#, 3 rest 1 note G_, 8 - musicd7 + inc_octave note C_, 4 - musicd8 + dec_octave note E_, 4 note F#, 8 note F#, 4 musice8 6 note F#, 3 musice8 8 - Speed 1 + speed 1 note F#, 5 rest 2 - Speed 7 + speed 7 note F_, 14 rest 2 - musicd8 + dec_octave note G_, 1 note A_, 1 note B_, 1 - musicd7 + inc_octave note C_, 1 note D_, 1 - musicd8 + dec_octave note B_, 1 - musicd7 + inc_octave note C_, 1 note D_, 1 note E_, 1 @@ -484,20 +484,20 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note F_, 1 note A_, 1 note B_, 1 - musice5 64 - musice6 127 - Speed 1 + duty 1 + volume 127 + speed 1 Loop 4 note F_, 5 note C_, 5 - musicd8 + dec_octave note A_, 4 - musicd7 + inc_octave note C_, 5 - musicd8 + dec_octave note A_, 5 note F_, 4 - musicd7 + inc_octave EndLoop Loop 4 note G#, 5 @@ -505,14 +505,14 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note C_, 4 note F_, 5 note C_, 5 - musicd8 + dec_octave note G#, 4 - musicd7 + inc_octave EndLoop Loop 4 - musicd7 + inc_octave note D_, 5 - musicd8 + dec_octave note B_, 5 note G_, 4 note B_, 5 @@ -520,140 +520,140 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note D_, 4 EndLoop Loop 3 - musicd7 + inc_octave note C#, 5 - musicd8 + dec_octave note A#, 5 note G_, 4 note A#, 5 note G_, 5 note E_, 4 EndLoop - musicd7 + inc_octave note C#, 5 - musicd8 + dec_octave note C#, 5 note E_, 4 note G_, 5 note A#, 5 - musicd7 + inc_octave note C#, 4 - musice5 0 - musice6 128 - Speed 7 + duty 0 + volume 128 + speed 7 Loop 2 note C_, 1 - musice6 39 + volume 39 note C_, 1 rest 1 - musice6 112 - musicd8 + volume 112 + dec_octave note F_, 1 note A_, 8 - musicd7 + inc_octave note E_, 1 - musice6 39 + volume 39 note E_, 1 rest 1 - musice6 112 + volume 112 note D_, 1 EndLoop note C_, 1 - musice6 39 + volume 39 note C_, 1 rest 1 - musicd8 - musice6 112 + dec_octave + volume 112 note F_, 1 note G#, 12 note C_, 1 - musicd8 + dec_octave note F_, 1 note G#, 1 - musicd7 + inc_octave note C_, 1 note F_, 1 - musicd8 + dec_octave note G#, 1 - musicd7 + inc_octave note C_, 1 note F_, 1 note G#, 1 note C_, 1 note F_, 1 note G#, 1 - musicd7 + inc_octave note C_, 1 - musicd8 + dec_octave note F_, 1 note G#, 1 note B_, 1 EndMainLoop Branch_f9554: - Speed 1 - musice6 112 + speed 1 + volume 112 note F_, 11 - musice6 55 + volume 55 note F_, 3 - musice6 112 + volume 112 note F_, 11 - musice6 55 + volume 55 note F_, 10 rest 7 - musice6 112 + volume 112 note F_, 4 - musice6 55 + volume 55 note F_, 3 - musice6 112 + volume 112 note F_, 4 - musice6 55 + volume 55 note F_, 3 Loop 2 - musice6 112 + volume 112 note F_, 11 - musice6 55 + volume 55 note F_, 3 EndLoop music_ret Music_PokemonDome_Ch3: ; f9579 (3e:5579) - Speed 7 + speed 7 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 64 musice8 6 - musicdx 1 + octave 1 musice8 4 - Speed 1 + speed 1 Loop 8 note G_, 5 note G_, 5 note G_, 4 EndLoop musice8 6 - Speed 7 + speed 7 MainLoop - musicd7 + inc_octave note C_, 2 note C_, 2 rest 2 note C_, 1 note C_, 1 music_call Branch_f9613 - musicdx 1 + octave 1 musice8 4 note C_, 2 - musicd7 + inc_octave musice8 6 note C_, 2 rest 2 note C_, 1 note C_, 1 music_call Branch_f9613 - musicdx 2 + octave 2 note C_, 2 note C_, 2 rest 2 @@ -662,7 +662,7 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579) note C_, 2 note C_, 2 rest 2 - musicd8 + dec_octave note G_, 2 note B_, 2 note B_, 2 @@ -750,13 +750,13 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579) EndMainLoop Branch_f9613: - musicdx 2 + octave 2 note C_, 2 note C_, 2 rest 2 - musicd8 + dec_octave note G_, 2 - musicd7 + inc_octave note C_, 2 note C_, 2 rest 2 @@ -764,7 +764,7 @@ Branch_f9613: note C_, 1 note C_, 2 note C_, 2 - musicd8 + dec_octave musice8 4 note G_, 2 musice8 6 @@ -773,10 +773,10 @@ Branch_f9613: Music_PokemonDome_Ch4: ; f9629 (3e:5629) - Speed 7 - musicdx 1 + speed 7 + octave 1 note snare5, 8 - Speed 1 + speed 1 note snare1, 4 note snare2, 3 Loop 7 @@ -785,11 +785,11 @@ Music_PokemonDome_Ch4: ; f9629 (3e:5629) EndLoop MainLoop Loop 2 - Speed 7 + speed 7 note snare1, 2 note snare1, 2 rest 2 - Speed 1 + speed 1 note snare1, 4 note snare2, 3 note snare2, 4 diff --git a/music/ronald.asm b/music/ronald.asm index 773b01c..28261df 100644 --- a/music/ronald.asm +++ b/music/ronald.asm @@ -1,14 +1,14 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) musicdc 17 - musicea 8 - musiceb 12 + vibrato_rate 8 + vibrato_delay 12 musice8 8 - musice5 0 + duty 0 MainLoop - musicdx 3 - Speed 13 + octave 3 + speed 13 Loop 2 - musice6 146 + volume 146 musice8 3 note D_, 1 note D_, 1 @@ -23,15 +23,15 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note F_, 1 rest 1 - musice6 144 + volume 144 musice8 8 note E_, 2 rest 1 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 3 note G_, 1 - musicd7 + inc_octave note D_, 1 musice8 4 note F_, 1 @@ -45,72 +45,72 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note A_, 1 rest 1 musice8 8 - musice6 144 + volume 144 note G_, 2 rest 1 EndLoop Loop 2 - musiceb 20 + vibrato_delay 20 music_call Branch_fa9aa - Speed 1 - musicdx 4 + speed 1 + octave 4 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 2 - musiceb 12 + vibrato_delay 12 music_call Branch_fa9ec EndLoop Loop 2 - musiceb 20 + vibrato_delay 20 music_call Branch_fa9cb - Speed 1 - musicdx 4 + speed 1 + octave 4 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 2 - musiceb 12 + vibrato_delay 12 music_call Branch_fa9ec EndLoop music_call Branch_fa9aa - musiceb 20 - Speed 1 - musicdx 4 + vibrato_delay 20 + speed 1 + octave 4 note C#, 3 note D_, 3 rest 7 - musice5 128 - musice6 144 + duty 2 + volume 144 rest 6 - musicd8 + dec_octave musice8 4 note G_, 7 - musicd7 + inc_octave note F_, 6 - musicd8 + dec_octave note G_, 7 - musicd7 + inc_octave note E_, 6 - musicd8 + dec_octave note G_, 7 - musicd7 + inc_octave note D_, 6 - musicd8 + dec_octave note G_, 7 - musicd7 + inc_octave musice8 8 note C_, 4 note C#, 4 note C_, 5 - musicd8 + dec_octave musice8 4 note A#, 6 - musicd7 + inc_octave note C_, 7 - musicd8 + dec_octave note A#, 6 note G_, 7 note F_, 6 @@ -120,19 +120,19 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) musice8 4 note C#, 7 note C_, 6 - musicd8 + dec_octave note A#, 7 - musicd7 + inc_octave musice8 8 note C_, 4 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 6 - musicd7 + inc_octave musice8 4 note C_, 7 - musicd8 + dec_octave note A#, 6 note G_, 7 note F_, 6 @@ -140,45 +140,45 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G_, 6 musice8 8 note A#, 7 - musicd7 + inc_octave note C_, 6 note D_, 7 - Speed 13 + speed 13 music_call Branch_fa9aa - Speed 1 - musicdx 4 + speed 1 + octave 4 note C#, 3 note D_, 3 rest 7 - musice5 128 - musice6 144 + duty 2 + volume 144 rest 6 - musicd8 + dec_octave musice8 4 note G_, 7 - musicd7 + inc_octave note F_, 6 - musicd8 + dec_octave note G_, 7 - musicd7 + inc_octave note E_, 6 - musicd8 + dec_octave note G_, 7 - musicd7 + inc_octave note D_, 6 - musicd8 + dec_octave note G_, 7 - musicd7 + inc_octave musice8 8 note C_, 4 note C#, 4 note C_, 5 - musicd8 + dec_octave musice8 4 note A#, 6 - musicd7 + inc_octave note C_, 7 - musicd8 + dec_octave note A#, 6 note G_, 7 note F_, 6 @@ -186,16 +186,16 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G_, 6 musice8 8 note A#, 7 - musicd7 + inc_octave musice8 4 note C_, 6 - musicd8 + dec_octave note A#, 7 - musicd7 + inc_octave musice8 8 note C#, 4 note C_, 4 - musicd8 + dec_octave note A#, 5 musice8 4 note G_, 6 @@ -203,26 +203,26 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G_, 6 note C#, 7 note C_, 6 - musicd8 + dec_octave note A#, 7 - musicd7 + inc_octave musice8 8 note C_, 4 note C#, 4 note C_, 5 - musicd8 + dec_octave musice8 4 note A#, 6 note G_, 7 musice8 8 music_call Branch_fa9cb - Speed 1 - musicdx 4 + speed 1 + octave 4 note C#, 3 note D_, 3 rest 7 - musice5 128 - musice6 144 + duty 2 + volume 144 rest 13 musice8 4 note F_, 6 @@ -238,13 +238,13 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note E_, 6 musice8 4 note C_, 7 - musicd8 + dec_octave note G_, 6 - musicd7 + inc_octave note C_, 7 note C#, 6 note D_, 7 - musicd8 + dec_octave musice8 8 note A#, 6 musice8 4 @@ -260,7 +260,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) musice8 4 note G_, 7 note A#, 6 - musicd7 + inc_octave note C_, 7 musice8 8 note C#, 6 @@ -270,33 +270,33 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 7 musice8 8 note F_, 6 - musicd8 + dec_octave musice8 4 note G_, 7 - musicd8 + dec_octave note G_, 6 - musicd7 + inc_octave note D_, 7 - musice5 64 - musice6 160 + duty 1 + volume 160 musice8 8 music_call Branch_fa9cb - Speed 1 - musicdx 4 + speed 1 + octave 4 note C#, 3 note D_, 3 rest 7 rest 13 - musicd8 + dec_octave note G_, 3 note G#, 10 note G_, 3 rest 10 - Speed 13 + speed 13 note F_, 4 - musiceb 12 - Speed 1 - musice6 147 + vibrato_delay 12 + speed 1 + volume 147 note C_, 6 rest 7 rest 13 @@ -306,69 +306,69 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note A_, 6 rest 7 rest 13 - Speed 13 - musice6 144 + speed 13 + volume 144 note G_, 2 rest 1 - musiceb 20 - Speed 1 - musice6 160 + vibrato_delay 20 + speed 1 + volume 160 note F#, 3 note G_, 10 note A#, 3 rest 10 note G_, 3 rest 10 - musicd7 + inc_octave note D_, 13 rest 13 - musicd8 + dec_octave note A#, 6 rest 7 rest 13 note A#, 3 - musicd7 + inc_octave note C_, 10 rest 13 - musicd8 + dec_octave note A#, 3 rest 10 - musicd7 + inc_octave note C_, 13 - musicd8 + dec_octave note A#, 3 rest 10 - musicd7 + inc_octave note C#, 4 note C_, 4 - musicd8 + dec_octave note A#, 5 note G_, 3 rest 10 note B_, 3 - musicd7 + inc_octave note C_, 10 - musicd8 + dec_octave note A#, 3 rest 10 rest 13 - musicd7 + inc_octave note G_, 3 rest 10 note C_, 4 note C#, 4 note C_, 5 - musicd8 + dec_octave note A#, 3 rest 10 - musicd7 + inc_octave note C_, 13 - musicd8 + dec_octave note A#, 3 rest 10 note G_, 3 rest 10 - musicd7 + inc_octave note E_, 3 note F_, 10 rest 13 @@ -384,17 +384,17 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 10 note C#, 3 note D_, 10 - musicd8 + dec_octave note A#, 3 rest 10 note G_, 3 rest 10 - Speed 13 + speed 13 note A#, 3 rest 4 - Speed 1 + speed 1 note B_, 3 - musicd7 + inc_octave note C_, 16 rest 7 note E_, 3 @@ -406,23 +406,23 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 7 note C#, 3 note D_, 10 - musicd9 - Speed 13 + no_fade + speed 13 note D_, 5 rest 1 - musicd8 + dec_octave note D_, 8 rest 1 - musice5 0 - musiceb 12 + duty 0 + vibrato_delay 12 EndMainLoop Branch_fa9aa: - musicdx 4 - musice5 64 - musice6 160 + octave 4 + duty 1 + volume 160 rest 2 - Speed 1 + speed 1 note G#, 3 note A_, 3 rest 7 @@ -433,10 +433,10 @@ Branch_fa9aa: rest 13 note E_, 6 rest 7 - Speed 13 + speed 13 rest 1 note F_, 1 - Speed 1 + speed 1 note G_, 3 rest 10 note E_, 6 @@ -448,10 +448,10 @@ Branch_fa9aa: music_ret Branch_fa9cb: - musicdx 4 - musice5 64 - musice6 160 - Speed 1 + octave 4 + duty 1 + volume 160 + speed 1 note D#, 3 note E_, 10 note F_, 3 @@ -480,28 +480,28 @@ Branch_fa9cb: music_ret Branch_fa9ec: - musicdx 3 - musice5 0 - musice6 146 - Speed 1 + octave 3 + duty 0 + volume 146 + speed 1 note F_, 6 rest 7 - Speed 13 + speed 13 rest 2 - Speed 1 + speed 1 note F_, 6 rest 7 - Speed 13 + speed 13 rest 3 - Speed 1 + speed 1 note F_, 6 rest 7 rest 13 note A_, 6 rest 7 rest 13 - Speed 13 - musice6 144 + speed 13 + volume 144 note G_, 2 rest 1 music_ret @@ -509,24 +509,24 @@ Branch_fa9ec: Music_Ronald_Ch2: ; faa0e (3e:6a0e) musicdc 17 - musicea 8 - musiceb 12 + vibrato_rate 8 + vibrato_delay 12 musice8 8 - musice5 0 + duty 0 MainLoop - musicdx 2 + octave 2 Loop 2 - Speed 1 - musice6 146 + speed 1 + volume 146 note G_, 3 rest 3 note G_, 3 rest 4 note A#, 3 rest 10 - musicd7 + inc_octave note D_, 6 - musicd8 + dec_octave note G_, 3 rest 4 note A#, 3 @@ -547,26 +547,26 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 13 note G_, 3 note A#, 4 - musicd7 + inc_octave note D_, 6 rest 7 rest 13 - Speed 13 - musice6 144 + speed 13 + volume 144 note C_, 2 rest 1 - musicd8 - Speed 1 - musice6 146 + dec_octave + speed 1 + volume 146 note D_, 3 rest 3 note G_, 3 rest 4 note A#, 3 rest 10 - musicd7 + inc_octave note D_, 6 - musicd8 + dec_octave note G_, 3 rest 4 note A#, 3 @@ -574,10 +574,10 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 13 note G_, 3 note A#, 4 - musicd7 + inc_octave note D_, 6 rest 7 - musicd8 + dec_octave note D_, 3 rest 3 note G_, 3 @@ -585,57 +585,57 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) note G_, 6 rest 7 rest 13 - musicd7 + inc_octave note D_, 6 rest 13 - musicd8 + dec_octave note A#, 3 - musicd7 + inc_octave note D_, 4 note F_, 6 rest 7 rest 13 - Speed 13 - musice6 144 + speed 13 + volume 144 note E_, 2 rest 1 - musicd8 + dec_octave EndLoop Loop 4 music_call Branch_fab76 musice8 8 - musice6 128 + volume 128 note C_, 2 rest 1 music_call Branch_fab76 musice8 8 - musice6 128 + volume 128 note E_, 2 rest 1 EndLoop Loop 2 - musiceb 20 - musice6 128 - Speed 13 - musice5 64 - musicdx 4 + vibrato_delay 20 + volume 128 + speed 13 + duty 1 + octave 4 rest 2 musice8 4 note F_, 1 rest 1 musice8 8 note D_, 1 - musicd8 - musicd8 + dec_octave + dec_octave musice8 4 - musice5 0 - musice6 146 + duty 0 + volume 146 note A#, 1 rest 1 - musicd7 - musicd7 - musice5 64 - musice6 128 + inc_octave + inc_octave + duty 1 + volume 128 note C_, 1 rest 1 musice8 8 @@ -645,97 +645,97 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) musice8 4 note C_, 1 rest 1 - musicd8 + dec_octave note A_, 1 rest 1 note A#, 1 rest 2 - musiceb 12 - musice5 0 - musice6 146 + vibrato_delay 12 + duty 0 + volume 146 note F_, 1 rest 2 note F_, 1 rest 1 - musicd8 + dec_octave note G_, 1 rest 1 - musicd7 + inc_octave note F_, 1 rest 1 note A_, 1 rest 1 musice8 8 - musice6 144 + volume 144 note G_, 2 rest 1 EndLoop - musiceb 20 + vibrato_delay 20 music_call Branch_fab8a - musicdx 3 + octave 3 rest 2 - musiceb 12 - musice5 0 - musice6 146 + vibrato_delay 12 + duty 0 + volume 146 musice8 4 note F_, 1 rest 2 note F_, 1 rest 1 - musicd8 + dec_octave note G_, 1 rest 1 - musicd7 + inc_octave note F_, 1 rest 1 note A_, 1 rest 1 musice8 8 - musice6 144 + volume 144 note G_, 2 rest 1 - musiceb 20 + vibrato_delay 20 music_call Branch_fab8a - musicdx 3 + octave 3 rest 1 - Speed 1 + speed 1 musice8 8 note E_, 3 note F_, 10 note E_, 3 rest 10 - Speed 13 + speed 13 note D_, 4 - musicd8 - musiceb 12 - musice5 0 - musice6 146 + dec_octave + vibrato_delay 12 + duty 0 + volume 146 musice8 4 note G_, 1 rest 1 - musicd7 + inc_octave note D_, 1 rest 1 note D_, 1 rest 1 musice8 8 - musice6 144 + volume 144 note E_, 2 rest 1 music_call Branch_fabb1 rest 1 musice8 4 - musicdx 2 + octave 2 note A#, 1 rest 1 note A#, 1 rest 1 - musicd7 + inc_octave musice8 8 - musice6 144 + volume 144 note C_, 2 rest 1 - musice6 146 + volume 146 rest 2 musice8 4 note F_, 1 @@ -749,44 +749,44 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) note A_, 1 rest 1 musice8 8 - musice6 144 + volume 144 note F_, 2 rest 1 music_call Branch_fabb1 rest 1 - musicdx 2 + octave 2 musice8 4 note G_, 1 rest 1 note G_, 1 rest 1 - musicd7 + inc_octave musice8 8 - musice6 144 + volume 144 note C_, 2 rest 1 rest 2 - musicd8 - musice6 146 + dec_octave + volume 146 musice8 4 note G_, 1 rest 2 note G_, 1 rest 1 - musiceb 20 + vibrato_delay 20 musice8 8 - musice5 64 - musice6 112 + duty 1 + volume 112 note F#, 8 rest 1 - musice5 0 - musiceb 12 + duty 0 + vibrato_delay 12 EndMainLoop Branch_fab76: - musicdx 2 - musice6 146 - Speed 13 + octave 2 + volume 146 + speed 13 rest 2 musice8 4 note A#, 1 @@ -797,16 +797,16 @@ Branch_fab76: rest 1 note A#, 1 rest 1 - musicd7 + inc_octave note D_, 1 rest 1 music_ret Branch_fab8a: - musicdx 4 - musice5 64 - musice6 128 - Speed 13 + octave 4 + duty 1 + volume 128 + speed 13 note C_, 1 musice8 3 note D_, 1 @@ -814,12 +814,12 @@ Branch_fab8a: musice8 4 note C_, 1 rest 1 - musicd8 + dec_octave note A_, 1 rest 1 note A#, 1 rest 1 - musicd7 + inc_octave musice8 8 note C_, 1 musice8 3 @@ -827,7 +827,7 @@ Branch_fab8a: note E_, 1 musice8 8 note C_, 1 - musicd8 + dec_octave musice8 4 note A_, 1 rest 1 @@ -835,38 +835,38 @@ Branch_fab8a: music_ret Branch_fabb1: - musicdx 2 - musice6 146 - Speed 13 + octave 2 + volume 146 + speed 13 rest 2 musice8 4 note A#, 1 rest 2 note A#, 1 rest 1 - musicd7 + inc_octave note C_, 1 music_ret Music_Ronald_Ch3: ; fabc0 (3e:6bc0) - Speed 1 + speed 1 musicdc 17 - musice6 32 - musice7 1 + volume 32 + duty3 1 musice9 0 musice8 8 MainLoop - musicdx 1 + octave 1 Loop 4 note G_, 13 note G_, 2 rest 4 note G_, 5 rest 2 - musicd7 + inc_octave note A#, 6 - musicd8 + dec_octave note F_, 2 rest 5 note F_, 6 @@ -879,16 +879,16 @@ Music_Ronald_Ch3: ; fabc0 (3e:6bc0) note F_, 7 note G_, 6 rest 7 - musicd7 + inc_octave note C_, 13 rest 6 - musicd7 + inc_octave note C_, 2 rest 11 - musicd8 + dec_octave note C_, 2 rest 5 - musicd8 + dec_octave note E_, 13 rest 6 note F_, 7 @@ -896,228 +896,228 @@ Music_Ronald_Ch3: ; fabc0 (3e:6bc0) note F_, 7 note F#, 13 note G_, 13 - musicd7 + inc_octave note C_, 6 rest 7 - musicd8 + dec_octave EndLoop Loop 8 music_call Branch_fac94 - musicdx 2 + octave 2 note A#, 6 music_call Branch_facbb music_call Branch_fac94 - musicdx 3 + octave 3 note F_, 6 music_call Branch_facbb EndLoop music_call Branch_facc5 - musicdx 1 + octave 1 note D_, 13 rest 6 - musicd7 + inc_octave note D_, 2 rest 5 - musicd7 + inc_octave note D_, 6 - musicdx 1 + octave 1 note D_, 2 rest 5 note D_, 13 - musicdx 3 + octave 3 note D_, 6 - musicdx 1 + octave 1 note A_, 7 rest 6 - musicd7 + inc_octave note C_, 7 note C_, 13 note C#, 13 note D_, 6 rest 7 - musicd8 + dec_octave note C_, 13 note C_, 2 rest 4 note C_, 5 rest 2 - musicdx 3 + octave 3 note D_, 6 - musicdx 1 + octave 1 note G_, 2 rest 5 note G_, 6 - musicd7 + inc_octave note C_, 3 rest 4 - musicd8 + dec_octave note C_, 2 rest 4 note C_, 3 rest 4 - musicdx 3 + octave 3 note D_, 6 - musicdx 1 + octave 1 note G_, 7 note C_, 6 rest 7 note D_, 13 rest 6 - musicd7 + inc_octave note D_, 2 rest 5 - musicd7 + inc_octave note D_, 6 - musicdx 1 + octave 1 note D_, 2 rest 5 note D_, 13 - musicdx 3 + octave 3 note F_, 6 - musicdx 1 + octave 1 note A_, 7 rest 6 - musicd7 + inc_octave note D_, 7 note D_, 13 - musicd8 + dec_octave note A_, 13 note D_, 6 rest 7 music_call Branch_facc5 - musicdx 1 + octave 1 note G#, 13 rest 6 - musicd7 + inc_octave note G#, 2 rest 5 - musicd7 + inc_octave note D_, 6 - musicdx 1 + octave 1 note G#, 2 rest 5 note G#, 13 - musicdx 3 + octave 3 note D_, 6 - musicd8 + dec_octave note D#, 7 rest 6 note G#, 7 note G#, 13 - musicd8 + dec_octave note G#, 13 - musicd7 + inc_octave note D#, 6 rest 7 - musicd8 + dec_octave note A_, 13 note A_, 2 rest 4 note A_, 5 rest 2 - musicdx 3 + octave 3 note D_, 6 - musicd8 + dec_octave note E_, 2 rest 5 note E_, 6 note E_, 3 rest 4 - musicd8 + dec_octave note A_, 2 rest 4 note A_, 3 rest 4 - musicdx 3 + octave 3 note D_, 6 - musicd8 + dec_octave note E_, 7 - musicd8 + dec_octave note A_, 6 rest 7 - Speed 13 + speed 13 note G#, 8 rest 1 - Speed 1 + speed 1 EndMainLoop Branch_fac94: - musicdx 1 + octave 1 note G_, 13 note G_, 2 rest 4 note G_, 5 rest 2 - musicdx 3 + octave 3 note D_, 6 - musicd8 + dec_octave note D_, 2 rest 5 note D_, 6 note G_, 3 rest 4 - musicd8 + dec_octave note G_, 2 rest 4 note G_, 3 rest 4 - musicdx 3 + octave 3 note D_, 6 - musicdx 1 + octave 1 note F_, 7 note G_, 6 rest 7 - musicd7 + inc_octave note C_, 13 rest 6 - musicd7 + inc_octave note C_, 2 rest 5 note D_, 6 - musicd8 + dec_octave note C_, 2 rest 5 - musicd8 + dec_octave note E_, 13 - musicd7 + inc_octave music_ret Branch_facbb: - musicdx 1 + octave 1 note F_, 7 rest 6 note F_, 7 note F#, 13 note G_, 13 - musicd7 + inc_octave note C_, 6 rest 7 music_ret Branch_facc5: - musicdx 1 + octave 1 note D#, 13 note D#, 2 rest 4 note D#, 5 rest 2 - musicdx 3 + octave 3 note D_, 6 - musicdx 1 + octave 1 note A#, 2 rest 5 note A#, 6 - musicd7 + inc_octave note D#, 3 rest 4 - musicd8 + dec_octave note D#, 2 rest 4 note D#, 3 rest 4 - musicdx 3 + octave 3 note D_, 6 - musicdx 1 + octave 1 note A#, 7 note D#, 6 rest 7 @@ -1125,8 +1125,8 @@ Branch_facc5: Music_Ronald_Ch4: ; face0 (3e:6ce0) - Speed 1 - musicdx 1 + speed 1 + octave 1 MainLoop Loop 3 music_call Branch_fad46 @@ -1182,9 +1182,9 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) note snare3, 13 EndLoop music_call Branch_fad46 - Speed 13 + speed 13 note snare5, 4 - Speed 1 + speed 1 rest 6 note snare2, 3 note snare2, 4 diff --git a/music/titlescreen.asm b/music/titlescreen.asm index 7f4b4f3..3bd92c9 100644 --- a/music/titlescreen.asm +++ b/music/titlescreen.asm @@ -1,247 +1,247 @@ Music_TitleScreen_Ch1: ; f5052 (3d:5052) - Speed 7 - musice5 0 + speed 7 + duty 0 musicdc 17 - musicea 1 - musiceb 20 - musice6 160 + vibrato_rate 1 + vibrato_delay 20 + volume 160 musice8 8 - musicdx 3 + octave 3 note G_, 1 - musice6 55 + volume 55 note G_, 1 rest 1 - musice6 160 + volume 160 musice8 6 note F_, 1 musice8 8 note E_, 3 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note G_, 3 - musice6 55 + volume 55 note G_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note D_, 5 - musice6 55 + volume 55 note D_, 1 - musice6 208 + volume 208 musice8 6 note C_, 2 - musicd8 + dec_octave musice8 8 note G_, 10 - musice6 55 + volume 55 note G_, 2 - musice6 208 + volume 208 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 - musice6 160 + volume 160 musice8 6 note G_, 1 musice8 8 note G_, 5 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 musice8 6 note F_, 2 musice8 8 note F_, 2 - Speed 1 + speed 1 note E_, 5 - musicd9 + no_fade note F_, 4 - musicd9 + no_fade note E_, 5 - Speed 7 + speed 7 note D_, 1 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note C_, 1 - musice6 55 + volume 55 note C_, 1 - musice6 160 + volume 160 musice8 8 note D_, 11 - musice6 55 + volume 55 note D_, 1 - musice6 208 + volume 208 note G_, 1 - musice6 55 + volume 55 note G_, 1 rest 1 - musice6 160 + volume 160 musice8 6 note F_, 1 musice8 8 note E_, 3 - musice6 55 + volume 55 note E_, 1 - musice6 160 + volume 160 note G_, 3 - musice6 55 + volume 55 note G_, 1 - musicd7 - musice6 160 + inc_octave + volume 160 note D_, 5 - musice6 55 + volume 55 note D_, 1 - musice6 208 + volume 208 musice8 6 note E_, 2 - musicd8 + dec_octave musice8 8 note G_, 8 - musice6 55 + volume 55 note G_, 2 - musice6 208 + volume 208 note E_, 2 note F_, 2 note G_, 2 note G#, 3 - musice6 55 + volume 55 note G#, 1 - musice6 208 - musicd7 + volume 208 + inc_octave note C_, 3 - musice6 55 + volume 55 note C_, 1 - musice6 160 + volume 160 note D_, 5 - musice6 55 + volume 55 note D_, 1 - musice6 208 + volume 208 musice8 6 note C_, 2 musice8 8 note G_, 9 - musice6 55 + volume 55 note G_, 1 - musice6 208 + volume 208 note F_, 2 note C_, 2 note D_, 2 Loop 2 note E_, 10 - musice6 55 + volume 55 note E_, 2 - musice6 160 + volume 160 note E_, 1 - musice6 55 + volume 55 note E_, 1 rest 1 - musice6 160 + volume 160 musice8 6 note E_, 1 musice8 8 EndLoop note E_, 12 - musice6 55 + volume 55 note E_, 2 - musice6 160 + volume 160 note D_, 1 note C_, 1 note D_, 1 - musice6 55 + volume 55 note D_, 1 rest 1 - musice6 160 + volume 160 musice8 6 note G_, 1 musice8 8 note G_, 8 - musice6 55 + volume 55 note G_, 2 - musice6 160 - Speed 1 + volume 160 + speed 1 musice8 7 note G_, 5 note G_, 4 note G_, 5 musice8 8 - Speed 7 + speed 7 note G_, 9 - musice6 55 + volume 55 note G_, 1 - musice6 160 + volume 160 note F_, 2 note C_, 2 note D_, 2 note E_, 10 - musice6 55 + volume 55 note E_, 2 - musice6 160 + volume 160 note C_, 1 - musice6 55 + volume 55 note C_, 1 rest 1 musice8 6 - musice6 160 + volume 160 note E_, 1 musice8 8 note E_, 6 - musice6 55 + volume 55 note E_, 2 - musice6 160 + volume 160 note D_, 3 - musice6 55 + volume 55 note D_, 1 - musice6 160 + volume 160 note C_, 3 - musice6 55 + volume 55 note C_, 1 - musice6 160 + volume 160 note C_, 6 - musice6 55 + volume 55 note C_, 2 - musicd8 - musice6 160 + dec_octave + volume 160 note B_, 5 - musice6 55 + volume 55 note B_, 2 - musice6 160 - musicd7 + volume 160 + inc_octave musice8 6 note C_, 1 musice8 8 note C_, 8 - musicd9 + no_fade note C_, 8 - musicd9 + no_fade note C_, 8 - musice6 55 + volume 55 note C_, 8 music_end Music_TitleScreen_Ch2: ; f5193 (3d:5193) - Speed 7 - musice5 0 + speed 7 + duty 0 musicdc 17 - musicea 1 - musiceb 20 - musice6 128 + vibrato_rate 1 + vibrato_delay 20 + volume 128 musice8 8 - musicdx 2 + octave 2 note B_, 1 - musice6 39 + volume 39 note B_, 1 rest 1 - musicd7 - musice6 128 + inc_octave + volume 128 musice8 6 note D_, 1 musice8 8 note C_, 3 - musice6 39 + volume 39 note C_, 1 - musice6 128 + volume 128 note E_, 3 rest 1 note G_, 5 @@ -264,7 +264,7 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) note C_, 2 musice8 8 note C_, 2 - musicd8 + dec_octave note G_, 1 rest 1 note E_, 1 @@ -272,23 +272,23 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) note F_, 4 note A_, 1 rest 2 - musicd7 + inc_octave musice8 6 note C_, 1 - musicd8 + dec_octave musice8 8 note B_, 3 rest 1 note B_, 1 rest 2 - musicd7 + inc_octave musice8 6 note D_, 1 musice8 8 note C_, 3 - musice6 39 + volume 39 note C_, 1 - musice6 128 + volume 128 note E_, 3 rest 1 note G_, 5 @@ -315,58 +315,58 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) note G#, 2 note F_, 2 note G#, 2 - musicd7 + inc_octave note C_, 10 rest 2 - musicd8 + dec_octave note A_, 1 - musice6 39 + volume 39 note A_, 1 rest 1 - musice6 128 - musicd7 + volume 128 + inc_octave musice8 6 note C_, 1 musice8 8 - musicd8 + dec_octave note B_, 10 rest 2 note G_, 1 - musice6 39 + volume 39 note G_, 1 rest 1 - musice6 128 + volume 128 musice8 6 note B_, 1 musice8 8 note A_, 12 - musice6 39 + volume 39 note A_, 2 - musice6 128 + volume 128 note B_, 1 note A_, 1 note B_, 1 - musice6 39 + volume 39 note B_, 1 rest 1 - musice6 128 - musicd7 + volume 128 + inc_octave musice8 6 note D_, 1 musice8 8 note D_, 8 rest 2 - Speed 1 + speed 1 musice8 7 note D_, 5 note D_, 4 note D_, 5 - Speed 7 + speed 7 musice8 8 note C_, 9 rest 1 note C_, 2 - musicd8 + dec_octave musice8 7 note G#, 2 musice8 8 @@ -393,7 +393,7 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) musice8 8 note F_, 7 rest 1 - Speed 1 + speed 1 musice8 8 note F_, 14 rest 5 @@ -401,21 +401,21 @@ Music_TitleScreen_Ch2: ; f5193 (3d:5193) rest 5 note F_, 14 rest 5 - Speed 7 + speed 7 note E_, 8 - musice6 39 + volume 39 note E_, 8 music_end Music_TitleScreen_Ch3: ; f5286 (3d:5286) - Speed 7 - musice7 4 - musice6 32 + speed 7 + duty3 4 + volume 32 musice9 0 musicdc 17 musice8 6 - musicdx 2 + octave 2 rest 4 music_call Branch_f52f0 note F_, 4 @@ -426,7 +426,7 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286) note D_, 4 note G_, 4 note G_, 4 - musicd7 + inc_octave music_call Branch_f52f0 Loop 4 note F_, 4 @@ -474,21 +474,21 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286) Loop 4 note G_, 4 EndLoop - musicd7 + inc_octave note C_, 4 note C_, 4 - Speed 1 + speed 1 note C_, 9 - musicd9 + no_fade note C_, 10 - musicd8 + dec_octave note G_, 9 - musicd9 + no_fade note G_, 9 note G_, 9 - musicd9 + no_fade note G_, 10 - Speed 7 + speed 7 musice8 8 note C_, 8 music_end @@ -496,7 +496,7 @@ Music_TitleScreen_Ch3: ; f5286 (3d:5286) Branch_f52f0: note C_, 4 note C_, 4 - musicd8 + dec_octave note B_, 4 note B_, 4 note A_, 4 @@ -507,8 +507,8 @@ Branch_f52f0: Music_TitleScreen_Ch4: ; f52fa (3d:52fa) - Speed 7 - musicdx 1 + speed 7 + octave 1 rest 4 Loop 16 music_call Branch_f5312 @@ -523,11 +523,11 @@ Music_TitleScreen_Ch4: ; f52fa (3d:52fa) music_end Branch_f5312: - Speed 7 + speed 7 note snare1, 2 note snare2, 2 note snare1, 2 - Speed 1 + speed 1 note snare2, 4 note snare2, 3 note snare2, 4 @@ -535,11 +535,11 @@ Branch_f5312: music_ret Branch_f531e: - Speed 7 + speed 7 note snare1, 2 note snare1, 2 rest 2 - Speed 1 + speed 1 note snare1, 4 note snare2, 3 note snare2, 4 |