diff options
Diffstat (limited to 'audio')
74 files changed, 16048 insertions, 16111 deletions
diff --git a/audio/duty_2.asm b/audio/duty_2.asm deleted file mode 100644 index b4561091..00000000 --- a/audio/duty_2.asm +++ /dev/null @@ -1,32 +0,0 @@ -Music8_Channel3DutyPointers: ; 20361 (8:4361) - dw Music8_Channel3Duty0 - dw Music8_Channel3Duty1 - dw Music8_Channel3Duty2 - dw Music8_Channel3Duty3 - dw Music8_Channel3Duty4 - dw Music8_Channel3Duty5 ; unused - dw Music8_Channel3Duty5 ; unused - dw Music8_Channel3Duty5 ; unused - dw Music8_Channel3Duty5 ; unused - -; these are the definitions for the channel 3 instruments -; each instrument definition is made up of 32 points (nibbles) that form -; the graph of the wave -; the current instrument is copied to $FF30 -Music8_Channel3Duty0: ; 20373 (8:4373) - db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 - -Music8_Channel3Duty1: ; 20383 (8:4383) - db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 - -Music8_Channel3Duty2: ; 20393 (8:4393) - db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 - -Music8_Channel3Duty3: ; 203a3 (8:43a3) - db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 - -Music8_Channel3Duty4: ; 203b3 (8:43b3) - db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 - -Music8_Channel3Duty5: - diff --git a/audio/duty_3.asm b/audio/duty_3.asm deleted file mode 100644 index b9702a7f..00000000 --- a/audio/duty_3.asm +++ /dev/null @@ -1,33 +0,0 @@ -Music1f_Channel3DutyPointers: ; 7c361 (1f:4361) - dw Music1f_Channel3Duty0 - dw Music1f_Channel3Duty1 - dw Music1f_Channel3Duty2 - dw Music1f_Channel3Duty3 - dw Music1f_Channel3Duty4 - dw Music1f_Channel3Duty5 ; used in the Pokemon Tower theme - dw Music1f_Channel3Duty5 ; unused - dw Music1f_Channel3Duty5 ; unused - dw Music1f_Channel3Duty5 ; unused - -; these are the definitions for the channel 3 instruments -; each instrument definition is made up of 32 points (nibbles) that form -; the graph of the wave -; the current instrument is copied to $FF30 -Music1f_Channel3Duty0: ; 7c373 (1f:4373) - db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 - -Music1f_Channel3Duty1: ; 7c383 (1f:4383) - db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 - -Music1f_Channel3Duty2: ; 7c393 (1f:4393) - db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 - -Music1f_Channel3Duty3: ; 7c3a3 (1f:43a3) - db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 - -Music1f_Channel3Duty4: ; 7c3b3 (1f:43b3) - db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 - -; duty 5 reads from sfx data -Music1f_Channel3Duty5: ; 7c3c3 (1f:43c3) - diff --git a/audio/engine_1.asm b/audio/engine_1.asm index cf121bcd..8343074a 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,10 +1,10 @@ ; The first of three duplicated sound engines. -Func_9103:: ; 0x9103 +Music2_UpdateMusic:: ; 0x9103 ld c, CH0 .loop ld b, $0 - ld hl, $c026 + ld hl, wc026 add hl, bc ld a, [hl] and a @@ -12,13 +12,13 @@ Func_9103:: ; 0x9103 ld a, c cp CH4 jr nc, .asm_912e ; if sfx channel - ld a, [$c002] + ld a, [wc002] and a jr z, .asm_912e bit 7, a jr nz, .nextChannel set 7, a - ld [$c002], a + ld [wc002], a xor a ld [$ff25], a ld [$ff1a], a @@ -31,19 +31,20 @@ Func_9103:: ; 0x9103 ld a, c inc c ; inc channel number cp CH7 - jr nz, .loop + jr nz, .loop ret ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for $c02e: +; known flags for wc02e: +; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag Music2_ApplyMusicAffects: ; 0x9138 ld b, $0 - ld hl, $c0b6 ; delay unitl next note + ld hl, wc0b6 ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note @@ -53,36 +54,36 @@ Music2_ApplyMusicAffects: ; 0x9138 ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, $c02e + ld hl, wc02e add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Music2_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, $c02e + ld hl, wc02e add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, $c02e + ld hl, wc02e add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Music2_ApplyPitchBend .checkVibratoDelay - ld hl, $c04e ; vibrato delay + ld hl, wc04e ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -91,7 +92,7 @@ Music2_ApplyMusicAffects: ; 0x9138 .disablePitchBendVibrato ret .checkForVibrato - ld hl, $c056 ; vibrato rate + ld hl, wc056 ; vibrato rate add hl, bc ld a, [hl] and a @@ -99,7 +100,7 @@ Music2_ApplyMusicAffects: ; 0x9138 ret ; no vibrato .vibrato ld d, a - ld hl, $c05e + ld hl, wc05e add hl, bc ld a, [hl] and $f @@ -112,10 +113,10 @@ Music2_ApplyMusicAffects: ; 0x9138 swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, $c066 + ld hl, wc066 add hl, bc ld e, [hl] ; get note pitch - ld hl, $c02e + ld hl, wc02e add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -148,13 +149,13 @@ Music2_ApplyMusicAffects: ; 0x9138 ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Music2_PlayNextNote ; 0x91d0 - ld hl, $c06e + ld hl, wc06e add hl, bc ld a, [hl] - ld hl, $c04e + ld hl, wc04e add hl, bc ld [hl], a - ld hl, $c02e + ld hl, wc02e add hl, bc res 4, [hl] res 5, [hl] @@ -167,7 +168,7 @@ Music2_endchannel: ; 0x91e6 cp $ff ; is this command an endchannel? jp nz, Music2_callchannel ; no ld b, $0 ; yes - ld hl, $c02e + ld hl, wc02e add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -177,7 +178,7 @@ Music2_endchannel: ; 0x91e6 jr .asm_923f .noiseOrSfxChannel res 2, [hl] - ld hl, $c036 + ld hl, wc036 add hl, bc res 0, [hl] cp CH6 @@ -188,11 +189,11 @@ Music2_endchannel: ; 0x91e6 ld [$ff1a], a .notSfxChannel3 jr nz, .asm_9222 - ld a, [$c003] + ld a, [wc003] and a jr z, .asm_9222 xor a - ld [$c003], a + ld [wc003], a jr .asm_923f .asm_9222 jr .asm_9248 @@ -202,10 +203,10 @@ Music2_endchannel: ; 0x91e6 ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de push hl ; store current channel address - ld hl, $c016 + ld hl, wc016 add hl, de ld e, l ld d, h @@ -223,12 +224,12 @@ Music2_endchannel: ; 0x91e6 and [hl] ld [$ff25], a .asm_9248 - ld a, [$c02a] + ld a, [wc02a] cp $14 jr nc, .asm_9251 jr .asm_926e .asm_9251 - ld a, [$c02a] + ld a, [wc02a] cp $86 jr z, .asm_926e jr c, .asm_925c @@ -240,12 +241,12 @@ Music2_endchannel: ; 0x91e6 call Func_96c7 ret c .asm_9265 - ld a, [$c005] + ld a, [wc005] ld [$ff24], a xor a - ld [$c005], a + ld [wc005], a .asm_926e - ld hl, $c026 + ld hl, wc026 add hl, bc ld [hl], b ret @@ -264,10 +265,10 @@ Music2_callchannel: ; 0x9274 ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de push hl - ld hl, $c016 + ld hl, wc016 add hl, de ld e, l ld d, h @@ -282,7 +283,7 @@ Music2_callchannel: ; 0x9274 inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 1, [hl] ; set the call flag jp Music2_endchannel @@ -295,7 +296,7 @@ Music2_loopchannel: ; 0x92a9 and a jr z, .infiniteLoop ld b, $0 - ld hl, $c0be + ld hl, wc0be add hl, bc ld a, [hl] cp e @@ -318,7 +319,7 @@ Music2_loopchannel: ; 0x92a9 ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de pop af ld [hli], a @@ -328,11 +329,11 @@ Music2_loopchannel: ; 0x92a9 Music2_notetype: ; 0x92e4 and $f0 cp $d0 ; is this command a notetype? - jp nz, Music2_togglecall ; no + jp nz, Music2_toggleperfectpitch ; no ld a, d ; yes and $f ld b, $0 - ld hl, $c0c6 + ld hl, wc0c6 add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -345,10 +346,10 @@ Music2_notetype: ; 0x92e4 jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, $c0e7 + ld hl, wc0e7 jr .sfxChannel3 .musicChannel3 - ld hl, $c0e6 + ld hl, wc0e6 .sfxChannel3 ld a, d and $f @@ -363,22 +364,22 @@ Music2_notetype: ; 0x92e4 ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, $c0de + ld hl, wc0de add hl, bc ld [hl], d .noiseChannel jp Music2_endchannel -Music2_togglecall: ; 0x9323 +Music2_toggleperfectpitch: ; 0x9323 ld a, d - cp $e8 ; is this command an togglecall? + cp $e8 ; is this command a toggleperfectpitch? jr nz, Music2_vibrato ; no ld b, $0 ; yes - ld hl, $c02e + ld hl, wc02e add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) + ld [hl], a ; flip bit 0 of wc02e jp Music2_endchannel Music2_vibrato: ; 0x9335 @@ -386,10 +387,10 @@ Music2_vibrato: ; 0x9335 jr nz, Music2_pitchbend ; no call Music2_GetNextMusicByte ; yes ld b, $0 - ld hl, $c04e + ld hl, wc04e add hl, bc - ld [hl], a ; store delay - ld hl, $c06e + ld [hl], a ; store delay + ld hl, wc06e add hl, bc ld [hl], a ; store delay call Music2_GetNextMusicByte @@ -397,7 +398,7 @@ Music2_vibrato: ; 0x9335 and $f0 swap a ld b, $0 - ld hl, $c056 + ld hl, wc056 add hl, bc srl a ld e, a @@ -408,7 +409,7 @@ Music2_vibrato: ; 0x9335 ld a, d and $f ld d, a - ld hl, $c05e + ld hl, wc05e add hl, bc swap a or d @@ -420,7 +421,7 @@ Music2_pitchbend: ; 0x936d jr nz, Music2_duty ; no call Music2_GetNextMusicByte ; yes ld b, $0 - ld hl, $c076 + ld hl, wc076 add hl, bc ld [hl], a ; store first param call Music2_GetNextMusicByte @@ -432,14 +433,14 @@ Music2_pitchbend: ; 0x936d and $f call Func_9858 ld b, $0 - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld [hl], d ; store unknown part of second param - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 4, [hl] ; set pitchbend flag call Music2_GetNextMusicByte @@ -454,45 +455,45 @@ Music2_duty: ; 0x93a5 rrca and $c0 ld b, $0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld [hl], a ; store duty jp Music2_endchannel Music2_tempo: ; 0x93ba cp $ed ; is this command a tempo? - jr nz, Music2_unknownmusic0xee ; no + jr nz, Music2_stereopanning ; no ld a, c ; yes cp CH4 jr nc, .sfxChannel call Music2_GetNextMusicByte - ld [$c0e8], a ; store first param + ld [wc0e8], a ; store first param call Music2_GetNextMusicByte - ld [$c0e9], a ; store second param + ld [wc0e9], a ; store second param xor a - ld [$c0ce], a ; clear RAM - ld [$c0cf], a - ld [$c0d0], a - ld [$c0d1], a + ld [wc0ce], a ; clear RAM + ld [wc0cf], a + ld [wc0d0], a + ld [wc0d1], a jr .musicChannelDone .sfxChannel call Music2_GetNextMusicByte - ld [$c0ea], a ; store first param + ld [wc0ea], a ; store first param call Music2_GetNextMusicByte - ld [$c0eb], a ; store second param + ld [wc0eb], a ; store second param xor a - ld [$c0d2], a ; clear RAM - ld [$c0d3], a - ld [$c0d4], a - ld [$c0d5], a + ld [wc0d2], a ; clear RAM + ld [wc0d3], a + ld [wc0d4], a + ld [wc0d5], a .musicChannelDone jp Music2_endchannel -Music2_unknownmusic0xee: ; 0x93fa - cp $ee ; is this command an unknownmusic0xee? +Music2_stereopanning: ; 0x93fa + cp $ee ; is this command a stereopanning? jr nz, Music2_unknownmusic0xef ; no call Music2_GetNextMusicByte ; yes - ld [$c004], a ; store first param + ld [wc004], a ; store panning jp Music2_endchannel ; this appears to never be used @@ -503,45 +504,45 @@ Music2_unknownmusic0xef ; 0x9407 push bc call Func_9876 pop bc - ld a, [$c003] + ld a, [wc003] and a jr nz, .skip - ld a, [$c02d] - ld [$c003], a + ld a, [wc02d] + ld [wc003], a xor a - ld [$c02d], a + ld [wc02d], a .skip jp Music2_endchannel Music2_dutycycle: ; 0x9426 cp $fc ; is this command a dutycycle? - jr nz, Music2_stereopanning ; no + jr nz, Music2_volume ; no call Music2_GetNextMusicByte ; yes ld b, $0 - ld hl, $c046 + ld hl, wc046 add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld [hl], a ; store first duty - ld hl, $c02e + ld hl, wc02e add hl, bc set 6, [hl] ; set dutycycle flag jp Music2_endchannel -Music2_stereopanning: ; 0x9444 - cp $f0 ; is this command a stereopanning? +Music2_volume: ; 0x9444 + cp $f0 ; is this command a volume? jr nz, Music2_executemusic ; no call Music2_GetNextMusicByte ; yes - ld [$ff24], a ; store stereopanning + ld [$ff24], a ; store volume jp Music2_endchannel Music2_executemusic: ; 0x9450 cp $f8 ; is this command an executemusic? jr nz, Music2_octave ; no ld b, $0 ; yes - ld hl, $c036 + ld hl, wc036 add hl, bc set 0, [hl] jp Music2_endchannel @@ -550,7 +551,7 @@ Music2_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? jr nz, Music2_unknownsfx0x20 ; no - ld hl, $c0d6 ; yes + ld hl, wc0d6 ; yes ld b, $0 add hl, bc ld a, d @@ -565,14 +566,14 @@ Music2_unknownsfx0x20: ; 0x9472 cp CH3 ; is this a noise or sfx channel? jr c, Music2_unknownsfx0x10 ; no ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music2_unknownsfx0x10 ; no call Music2_notelength ; yes ld d, a ld b, $0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld a, [hl] or d @@ -611,7 +612,7 @@ Music2_unknownsfx0x10: cp $10 ; is this command a unknownsfx0x10? jr nz, Music2_note ; no ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music2_note ; no @@ -646,7 +647,7 @@ Music2_dnote: call Music2_GetNextMusicByte ; get dnote instrument asm_94fd ld d, a - ld a, [$c003] + ld a, [wc003] and a jr nz, .asm_9508 ld a, d @@ -663,7 +664,7 @@ Music2_notelength: ; 0x950a ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, $c0c6 + ld hl, wc0c6 add hl, bc ld a, [hl] ld l, b @@ -671,9 +672,9 @@ Music2_notelength: ; 0x950a ld a, c cp CH4 jr nc, .sfxChannel - ld a, [$c0e8] + ld a, [wc0e8] ld d, a - ld a, [$c0e9] + ld a, [wc0e9] ld e, a jr .skip .sfxChannel @@ -682,31 +683,31 @@ Music2_notelength: ; 0x950a cp CH7 jr z, .skip ; if noise channel call Func_9693 - ld a, [$c0ea] + ld a, [wc0ea] ld d, a - ld a, [$c0eb] + ld a, [wc0eb] ld e, a .skip ld a, l ld b, $0 - ld hl, $c0ce + ld hl, wc0ce add hl, bc ld l, [hl] call Func_9847 ld e, l ld d, h - ld hl, $c0ce + ld hl, wc0ce add hl, bc ld [hl], e ld a, d - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld [hl], a - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music2_notepitch - ld hl, $c02e + ld hl, wc02e add hl, bc bit 2, [hl] jr z, Music2_notepitch @@ -721,7 +722,7 @@ Music2_notepitch: ; 0x9568 ld a, c cp CH4 jr nc, .sfxChannel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a @@ -754,12 +755,12 @@ Music2_notepitch: ; 0x9568 .notRest swap a ld b, $0 - ld hl, $c0d6 + ld hl, wc0d6 add hl, bc ld b, [hl] call Func_9858 ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc bit 4, [hl] jr z, .asm_95b8 @@ -769,7 +770,7 @@ Music2_notepitch: ; 0x9568 ld a, c cp CH4 jr nc, .skip ; if sfx channel - ld hl, $c02a + ld hl, wc02a ld d, $0 ld e, a add hl, de @@ -782,7 +783,7 @@ Music2_notepitch: ; 0x9568 ret .skip ld b, $0 - ld hl, $c0de + ld hl, wc0de add hl, bc ld d, [hl] ld b, $2 @@ -792,15 +793,15 @@ Music2_notepitch: ; 0x9568 call Func_95f8 pop de ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc - bit 0, [hl] - jr z, .asm_95ef - inc e - jr nc, .asm_95ef + bit 0, [hl] ; has toggleperfectpitch been used? + jr z, .skip2 + inc e ; if yes, increment the pitch by 1 + jr nc, .skip2 inc d -.asm_95ef - ld hl, $c066 +.skip2 + ld hl, wc066 add hl, bc ld [hl], e call Func_964b @@ -818,13 +819,13 @@ Func_95f8: ; 0x95f8 jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [$c004] + ld a, [wc004] ld hl, Unknown_9b27 add hl, bc and [hl] @@ -842,7 +843,7 @@ Func_95f8: ; 0x95f8 Func_9629: ; 0x9629 ld b, $0 - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld d, [hl] ld a, c @@ -853,7 +854,7 @@ Func_9629: ; 0x9629 ld a, d and $3f ld d, a - ld hl, $c03e + ld hl, wc03e add hl, bc ld a, [hl] or d @@ -873,16 +874,16 @@ Func_964b: ; 0x964b ; fall through .channel3 push de - ld de, $c0e6 + ld de, wc0e6 cp CH2 jr z, .musicChannel3 - ld de, $c0e7 + ld de, wc0e7 .musicChannel3 ld a, [de] add a ld d, $0 ld e, a - ld hl, Music2_Channel3DutyPointers + ld hl, Music2_WavePointers add hl, de ld e, [hl] inc hl @@ -919,27 +920,27 @@ Func_9693: ; 0x9693 call Func_96e5 jr nc, .asm_96ab ld d, $0 - ld a, [$c0f2] + ld a, [wc0f2] add $80 jr nc, .asm_96a2 inc d .asm_96a2 - ld [$c0eb], a + ld [wc0eb], a ld a, d - ld [$c0ea], a + ld [wc0ea], a jr .asm_96b4 .asm_96ab xor a - ld [$c0eb], a + ld [wc0eb], a ld a, $1 - ld [$c0ea], a + ld [wc0ea], a .asm_96b4 ret Func_96b5: ; 0x96b5 call Func_96e5 jr nc, .asm_96c6 - ld a, [$c0f1] + ld a, [wc0f1] add e jr nc, .asm_96c1 inc d @@ -955,7 +956,7 @@ Func_96b5: ; 0x96b5 Func_96c7: ; 0x96c7 call Func_96e5 jr nc, .asm_96e2 - ld hl, $c006 + ld hl, wc006 ld e, c ld d, $0 sla e @@ -976,7 +977,7 @@ Func_96c7: ; 0x96c7 ret Func_96e5: ; 0x96e5 - ld a, [$c02a] + ld a, [wc02a] cp $14 jr nc, .asm_96ee jr .asm_96f4 @@ -993,27 +994,27 @@ Func_96e5: ; 0x96e5 ret Music2_ApplyPitchBend: ; 0x96f9 - ld hl, $c02e + ld hl, wc02e add hl, bc bit 5, [hl] jp nz, .asm_9740 - ld hl, $c09e + ld hl, wc09e add hl, bc ld e, [hl] - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c07e + ld hl, wc07e add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, $c08e + ld hl, wc08e add hl, bc push hl - ld hl, $c086 + ld hl, wc086 add hl, bc ld a, [hl] pop hl @@ -1025,26 +1026,26 @@ Music2_ApplyPitchBend: ; 0x96f9 ld a, $0 adc d ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, [hl] cp d jp c, .asm_9786 jr nz, .asm_9773 - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, [hl] cp e jp c, .asm_9786 jr .asm_9773 .asm_9740 - ld hl, $c09e + ld hl, wc09e add hl, bc ld a, [hl] - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c07e + ld hl, wc07e add hl, bc ld e, [hl] sub e @@ -1052,7 +1053,7 @@ Music2_ApplyPitchBend: ; 0x96f9 ld a, d sbc b ld d, a - ld hl, $c086 + ld hl, wc086 add hl, bc ld a, [hl] add a @@ -1063,22 +1064,22 @@ Music2_ApplyPitchBend: ; 0x96f9 ld a, d sbc b ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, d cp [hl] jr c, .asm_9786 jr nz, .asm_9773 - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, e cp [hl] jr c, .asm_9786 .asm_9773 - ld hl, $c09e + ld hl, wc09e add hl, bc ld [hl], e - ld hl, $c096 + ld hl, wc096 add hl, bc ld [hl], d ld b, $3 @@ -1088,54 +1089,54 @@ Music2_ApplyPitchBend: ; 0x96f9 ld [hl], d ret .asm_9786 - ld hl, $c02e + ld hl, wc02e add hl, bc res 4, [hl] res 5, [hl] ret Func_978f: ; 0x978f - ld hl, $c096 + ld hl, wc096 add hl, bc ld [hl], d - ld hl, $c09e + ld hl, wc09e add hl, bc ld [hl], e - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld a, [hl] - ld hl, $c076 + ld hl, wc076 add hl, bc sub [hl] jr nc, .asm_97a7 ld a, $1 .asm_97a7 ld [hl], a - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc sub [hl] jr c, .asm_97c3 ld d, a ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 5, [hl] jr .asm_97e6 .asm_97c3 - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c09e + ld hl, wc09e add hl, bc ld e, [hl] - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, [hl] sub e @@ -1143,17 +1144,17 @@ Func_978f: ; 0x978f ld a, d sbc b ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc res 5, [hl] .asm_97e6 - ld hl, $c076 + ld hl, wc076 add hl, bc .asm_97ea inc b @@ -1172,20 +1173,20 @@ Func_978f: ; 0x978f add [hl] ld d, b ld b, $0 - ld hl, $c07e + ld hl, wc07e add hl, bc ld [hl], d - ld hl, $c086 + ld hl, wc086 add hl, bc ld [hl], a - ld hl, $c08e + ld hl, wc08e add hl, bc ld [hl], a ret Music2_ApplyDutyCycle: ; 0x980d ld b, $0 - ld hl, $c046 + ld hl, wc046 add hl, bc ld a, [hl] rlca @@ -1206,7 +1207,7 @@ Music2_GetNextMusicByte: ; 0x9825 ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de ld a, [hli] ld e, a @@ -1254,7 +1255,7 @@ Func_9858: ; 0x9858 add hl, hl ld d, h ld e, l - ld hl, Unknown_9b2f + ld hl, Music2_Pitches add hl, de ld e, [hl] inc hl @@ -1274,7 +1275,7 @@ Func_9858: ; 0x9858 ret Func_9876:: ; 0x9876 - ld [$c001], a + ld [wc001], a cp $ff jp z, Func_9a34 cp $b9 @@ -1285,63 +1286,63 @@ Func_9876:: ; 0x9876 jp nc, Func_994e .asm_988d xor a - ld [$c000], a - ld [$c003], a - ld [$c0e9], a - ld [$c0e6], a - ld [$c0e7], a + ld [wc000], a + ld [wc003], a + ld [wc0e9], a + ld [wc0e6], a + ld [wc0e7], a ld d, $8 - ld hl, $c016 + ld hl, wc016 call FillMusicRAM2 - ld hl, $c006 + ld hl, wc006 call FillMusicRAM2 ld d, $4 - ld hl, $c026 + ld hl, wc026 call FillMusicRAM2 - ld hl, $c02e + ld hl, wc02e call FillMusicRAM2 - ld hl, $c03e + ld hl, wc03e call FillMusicRAM2 - ld hl, $c046 + ld hl, wc046 call FillMusicRAM2 - ld hl, $c04e + ld hl, wc04e call FillMusicRAM2 - ld hl, $c056 + ld hl, wc056 call FillMusicRAM2 - ld hl, $c05e + ld hl, wc05e call FillMusicRAM2 - ld hl, $c066 + ld hl, wc066 call FillMusicRAM2 - ld hl, $c06e + ld hl, wc06e call FillMusicRAM2 - ld hl, $c036 + ld hl, wc036 call FillMusicRAM2 - ld hl, $c076 + ld hl, wc076 call FillMusicRAM2 - ld hl, $c07e + ld hl, wc07e call FillMusicRAM2 - ld hl, $c086 + ld hl, wc086 call FillMusicRAM2 - ld hl, $c08e + ld hl, wc08e call FillMusicRAM2 - ld hl, $c096 + ld hl, wc096 call FillMusicRAM2 - ld hl, $c09e + ld hl, wc09e call FillMusicRAM2 - ld hl, $c0a6 + ld hl, wc0a6 call FillMusicRAM2 - ld hl, $c0ae + ld hl, wc0ae call FillMusicRAM2 ld a, $1 - ld hl, $c0be + ld hl, wc0be call FillMusicRAM2 - ld hl, $c0b6 + ld hl, wc0b6 call FillMusicRAM2 - ld hl, $c0c6 + ld hl, wc0c6 call FillMusicRAM2 - ld [$c0e8], a + ld [wc0e8], a ld a, $ff - ld [$c004], a + ld [wc004], a xor a ld [$ff24], a ld a, $8 @@ -1366,9 +1367,9 @@ Func_994e: ; 0x994e ld de, SFX_Headers_02 add hl, de ld a, h - ld [$c0ec], a + ld [wc0ec], a ld a, l - ld [$c0ed], a + ld [wc0ed], a ld a, [hl] and $c0 rlca @@ -1381,9 +1382,9 @@ Func_994e: ; 0x994e add c ld c, a ld b, $0 - ld a, [$c0ec] + ld a, [wc0ec] ld h, a - ld a, [$c0ed] + ld a, [wc0ed] ld l, a add hl, bc ld c, d @@ -1391,7 +1392,7 @@ Func_994e: ; 0x994e and $f ld e, a ld d, $0 - ld hl, $c026 + ld hl, wc026 add hl, de ld a, [hl] and a @@ -1399,7 +1400,7 @@ Func_994e: ; 0x994e ld a, e cp $7 jr nz, .asm_999a - ld a, [$c001] + ld a, [wc001] cp $14 jr nc, .asm_9993 ret @@ -1409,7 +1410,7 @@ Func_994e: ; 0x994e jr z, .asm_99a3 jr c, .asm_99a3 .asm_999a - ld a, [$c001] + ld a, [wc001] cp [hl] jr z, .asm_99a3 jr c, .asm_99a3 @@ -1422,77 +1423,77 @@ Func_994e: ; 0x994e add hl, hl ld d, h ld e, l - ld hl, $c016 + ld hl, wc016 add hl, de ld [hli], a ld [hl], a - ld hl, $c006 + ld hl, wc006 add hl, de ld [hli], a ld [hl], a pop de - ld hl, $c026 + ld hl, wc026 add hl, de ld [hl], a - ld hl, $c02e + ld hl, wc02e add hl, de ld [hl], a - ld hl, $c03e + ld hl, wc03e add hl, de ld [hl], a - ld hl, $c046 + ld hl, wc046 add hl, de ld [hl], a - ld hl, $c04e + ld hl, wc04e add hl, de ld [hl], a - ld hl, $c056 + ld hl, wc056 add hl, de ld [hl], a - ld hl, $c05e + ld hl, wc05e add hl, de ld [hl], a - ld hl, $c066 + ld hl, wc066 add hl, de ld [hl], a - ld hl, $c06e + ld hl, wc06e add hl, de ld [hl], a - ld hl, $c076 + ld hl, wc076 add hl, de ld [hl], a - ld hl, $c07e + ld hl, wc07e add hl, de ld [hl], a - ld hl, $c086 + ld hl, wc086 add hl, de ld [hl], a - ld hl, $c08e + ld hl, wc08e add hl, de ld [hl], a - ld hl, $c096 + ld hl, wc096 add hl, de ld [hl], a - ld hl, $c09e + ld hl, wc09e add hl, de ld [hl], a - ld hl, $c0a6 + ld hl, wc0a6 add hl, de ld [hl], a - ld hl, $c0ae + ld hl, wc0ae add hl, de ld [hl], a - ld hl, $c036 + ld hl, wc036 add hl, de ld [hl], a ld a, $1 - ld hl, $c0be + ld hl, wc0be add hl, de ld [hl], a - ld hl, $c0b6 + ld hl, wc0b6 add hl, de ld [hl], a - ld hl, $c0c6 + ld hl, wc0c6 add hl, de ld [hl], a ld a, e @@ -1526,24 +1527,24 @@ Func_9a34: ; 0x9a34 ld a, $77 ld [$ff24], a xor a - ld [$c000], a - ld [$c003], a - ld [$c002], a - ld [$c0e9], a - ld [$c0eb], a - ld [$c0e6], a - ld [$c0e7], a + ld [wc000], a + ld [wc003], a + ld [wc002], a + ld [wc0e9], a + ld [wc0eb], a + ld [wc0e6], a + ld [wc0e7], a ld d, $a0 - ld hl, $c006 + ld hl, wc006 call FillMusicRAM2 ld a, $1 ld d, $18 - ld hl, $c0b6 + ld hl, wc0b6 call FillMusicRAM2 - ld [$c0e8], a - ld [$c0ea], a + ld [wc0e8], a + ld [wc0ea], a ld a, $ff - ld [$c004], a + ld [wc004], a ret ; fills d bytes at hl with a @@ -1556,7 +1557,7 @@ FillMusicRAM2: ; 0x9a89 ret Func_9a8f: ; 0x9a8f - ld a, [$c001] + ld a, [wc001] ld l, a ld e, a ld h, $0 @@ -1567,7 +1568,7 @@ Func_9a8f: ; 0x9a8f add hl, de ld e, l ld d, h - ld hl, $c006 + ld hl, wc006 ld a, [de] ; get channel number ld b, a rlca @@ -1593,14 +1594,14 @@ Func_9a8f: ; 0x9a8f push af ld b, $0 ld c, a - ld hl, $c026 + ld hl, wc026 add hl, bc - ld a, [$c001] + ld a, [wc001] ld [hl], a pop af cp $3 jr c, .asm_9ad2 - ld hl, $c02e + ld hl, wc02e add hl, bc set 2, [hl] .asm_9ad2 @@ -1619,32 +1620,32 @@ Func_9a8f: ; 0x9a8f ld a, [de] inc de jr nz, .asm_9ab1 - ld a, [$c001] + ld a, [wc001] cp $14 jr nc, .asm_9aeb jr .asm_9b15 .asm_9aeb - ld a, [$c001] + ld a, [wc001] cp $86 jr z, .asm_9b15 jr c, .asm_9af6 jr .asm_9b15 .asm_9af6 - ld hl, $c02a + ld hl, wc02a ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, $c012 ; sfx noise channel pointer + ld hl, wc012 ; sfx noise channel pointer ld de, Noise2_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [$c005] + ld a, [wc005] and a jr nz, .asm_9b15 ld a, [$ff24] - ld [$c005], a + ld [wc005], a ld a, $77 ld [$ff24], a .asm_9b15 @@ -1665,18 +1666,18 @@ Unknown_9b27: ; 0x9b27 db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Unknown_9b2f: ; 0x9b2f - dw $F82C - dw $F89D - dw $F907 - dw $F96B - dw $F9CA - dw $FA23 - dw $FA77 - dw $FAC7 - dw $FB12 - dw $FB58 - dw $FB9B - dw $FBDA +Music2_Pitches: ; 0x9b2f + dw $F82C ; C_ + dw $F89D ; C# + dw $F907 ; D_ + dw $F96B ; D# + dw $F9CA ; E_ + dw $FA23 ; F_ + dw $FA77 ; F# + dw $FAC7 ; G_ + dw $FB12 ; G# + dw $FB58 ; A_ + dw $FB9B ; A# + dw $FBDA ; B_ diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 9c64b5c1..b4cb653b 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,10 +1,10 @@ ; The second of three duplicated sound engines. -Func_21879:: ; 21879 (8:5879) +Music8_UpdateMusic:: ; 21879 (8:5879) ld c, CH0 .loop ld b, $0 - ld hl, $c026 + ld hl, wc026 add hl, bc ld a, [hl] and a @@ -12,13 +12,13 @@ Func_21879:: ; 21879 (8:5879) ld a, c cp CH4 jr nc, .applyAffects ; if sfx channel - ld a, [$c002] + ld a, [wc002] and a jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [$c002], a + ld [wc002], a xor a ld [$ff25], a ld [$ff1a], a @@ -36,14 +36,15 @@ Func_21879:: ; 21879 (8:5879) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for $c02e: +; known flags for wc02e: +; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag Music8_ApplyMusicAffects: ; 218ae (8:58ae) ld b, $0 - ld hl, $c0b6 ; delay unitl next note + ld hl, wc0b6 ; delay until next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note @@ -53,36 +54,36 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, $c02e + ld hl, wc02e add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Music8_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, $c02e + ld hl, wc02e add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, $c02e + ld hl, wc02e add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Music8_ApplyPitchBend .checkVibratoDelay - ld hl, $c04e ; vibrato delay + ld hl, wc04e ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -91,7 +92,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) .disablePitchBendVibrato ret .checkForVibrato - ld hl, $c056 ; vibrato rate + ld hl, wc056 ; vibrato rate add hl, bc ld a, [hl] and a @@ -99,7 +100,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) ret ; no vibrato .vibrato ld d, a - ld hl, $c05e + ld hl, wc05e add hl, bc ld a, [hl] and $f @@ -112,10 +113,10 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, $c066 + ld hl, wc066 add hl, bc ld e, [hl] ; get note pitch - ld hl, $c02e + ld hl, wc02e add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -148,20 +149,20 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae) ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached Music8_PlayNextNote: ; 21946 (8:5946) - ld hl, $c06e + ld hl, wc06e add hl, bc ld a, [hl] - ld hl, $c04e + ld hl, wc04e add hl, bc ld [hl], a - ld hl, $c02e + ld hl, wc02e add hl, bc res 4, [hl] res 5, [hl] ld a, c cp CH4 jr nz, .beginChecks - ld a, [$d083] + ld a, [wd083] bit 7, a ret nz .beginChecks @@ -174,7 +175,7 @@ Music8_endchannel: ; 21967 (8:5967) cp $ff ; is this command an endchannel? jp nz, Music8_callchannel ; no ld b, $0 ; yes - ld hl, $c02e + ld hl, wc02e add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -184,7 +185,7 @@ Music8_endchannel: ; 21967 (8:5967) jr .asm_219c0 .noiseOrSfxChannel res 2, [hl] - ld hl, $c036 + ld hl, wc036 add hl, bc res 0, [hl] cp CH6 @@ -195,11 +196,11 @@ Music8_endchannel: ; 21967 (8:5967) ld [$ff1a], a .notSfxChannel3 jr nz, .asm_219a3 - ld a, [$c003] + ld a, [wc003] and a jr z, .asm_219a3 xor a - ld [$c003], a + ld [wc003], a jr .asm_219c0 .asm_219a3 jr .asm_219c9 @@ -209,10 +210,10 @@ Music8_endchannel: ; 21967 (8:5967) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de push hl ; store current channel address - ld hl, $c016 + ld hl, wc016 add hl, de ld e, l ld d, h @@ -230,12 +231,12 @@ Music8_endchannel: ; 21967 (8:5967) and [hl] ld [$ff25], a .asm_219c9 - ld a, [$c02a] + ld a, [wc02a] cp $14 jr nc, .asm_219d2 jr .asm_219ef .asm_219d2 - ld a, [$c02a] + ld a, [wc02a] cp $86 jr z, .asm_219ef jr c, .asm_219dd @@ -247,12 +248,12 @@ Music8_endchannel: ; 21967 (8:5967) call Func_21e6d ret c .asm_219e6 - ld a, [$c005] + ld a, [wc005] ld [$ff24], a xor a - ld [$c005], a + ld [wc005], a .asm_219ef - ld hl, $c026 + ld hl, wc026 add hl, bc ld [hl], b ret @@ -271,10 +272,10 @@ Music8_callchannel: ; 219f5 (8:59f5) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de push hl - ld hl, $c016 + ld hl, wc016 add hl, de ld e, l ld d, h @@ -289,7 +290,7 @@ Music8_callchannel: ; 219f5 (8:59f5) inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 1, [hl] ; set the call flag jp Music8_endchannel @@ -302,7 +303,7 @@ Music8_loopchannel: ; 21a2a (8:5a2a) and a jr z, .infiniteLoop ld b, $0 - ld hl, $c0be + ld hl, wc0be add hl, bc ld a, [hl] cp e @@ -325,7 +326,7 @@ Music8_loopchannel: ; 21a2a (8:5a2a) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de pop af ld [hli], a @@ -335,11 +336,11 @@ Music8_loopchannel: ; 21a2a (8:5a2a) Music8_notetype: ; 21a65 (8:5a65) and $f0 cp $d0 ; is this command a notetype? - jp nz, Music8_togglecall ; no + jp nz, Music8_toggleperfectpitch ; no ld a, d ; yes and $f ld b, $0 - ld hl, $c0c6 + ld hl, wc0c6 add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -352,10 +353,10 @@ Music8_notetype: ; 21a65 (8:5a65) jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, $c0e7 + ld hl, wc0e7 jr .sfxChannel3 .musicChannel3 - ld hl, $c0e6 + ld hl, wc0e6 .sfxChannel3 ld a, d and $f @@ -370,22 +371,22 @@ Music8_notetype: ; 21a65 (8:5a65) ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, $c0de + ld hl, wc0de add hl, bc ld [hl], d .noiseChannel jp Music8_endchannel -Music8_togglecall: ; 21aa4 (8:5aa4) +Music8_toggleperfectpitch: ; 21aa4 (8:5aa4) ld a, d - cp $e8 ; is this command an togglecall? + cp $e8 ; is this command a toggleperfectpitch? jr nz, Music8_vibrato ; no ld b, $0 ; yes - ld hl, $c02e + ld hl, wc02e add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) + ld [hl], a ; flip bit 0 of wc02e jp Music8_endchannel Music8_vibrato: ; 21ab6 (8:5ab6) @@ -393,18 +394,18 @@ Music8_vibrato: ; 21ab6 (8:5ab6) jr nz, Music8_pitchbend ; no call Music8_GetNextMusicByte ; yes ld b, $0 - ld hl, $c04e + ld hl, wc04e add hl, bc - ld [hl], a ; store delay - ld hl, $c06e + ld [hl], a ; store delay + ld hl, wc06e add hl, bc - ld [hl], a ; store delay + ld [hl], a ; store delay call Music8_GetNextMusicByte ld d, a and $f0 swap a ld b, $0 - ld hl, $c056 + ld hl, wc056 add hl, bc srl a ld e, a @@ -415,7 +416,7 @@ Music8_vibrato: ; 21ab6 (8:5ab6) ld a, d and $f ld d, a - ld hl, $c05e + ld hl, wc05e add hl, bc swap a or d @@ -427,7 +428,7 @@ Music8_pitchbend: ; 21aee (8:5aee) jr nz, Music8_duty ; no call Music8_GetNextMusicByte ; yes ld b, $0 - ld hl, $c076 + ld hl, wc076 add hl, bc ld [hl], a ; store first param call Music8_GetNextMusicByte @@ -439,14 +440,14 @@ Music8_pitchbend: ; 21aee (8:5aee) and $f call Func_22017 ld b, $0 - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld [hl], d ; store unknown part of second param - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 4, [hl] ; set pitchbend flag call Music8_GetNextMusicByte @@ -461,45 +462,45 @@ Music8_duty: ; 21b26 (8:5b26) rrca and $c0 ld b, $0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld [hl], a ; store duty jp Music8_endchannel Music8_tempo: ; 21b3b (8:5b3b) cp $ed ; is this command a tempo? - jr nz, Music8_unknownmusic0xee ; no + jr nz, Music8_stereopanning ; no ld a, c ; yes cp CH4 jr nc, .sfxChannel call Music8_GetNextMusicByte - ld [$c0e8], a ; store first param + ld [wc0e8], a ; store first param call Music8_GetNextMusicByte - ld [$c0e9], a ; store second param + ld [wc0e9], a ; store second param xor a - ld [$c0ce], a ; clear RAM - ld [$c0cf], a - ld [$c0d0], a - ld [$c0d1], a + ld [wc0ce], a ; clear RAM + ld [wc0cf], a + ld [wc0d0], a + ld [wc0d1], a jr .musicChannelDone .sfxChannel call Music8_GetNextMusicByte - ld [$c0ea], a ; store first param + ld [wc0ea], a ; store first param call Music8_GetNextMusicByte - ld [$c0eb], a ; store second param + ld [wc0eb], a ; store second param xor a - ld [$c0d2], a ; clear RAM - ld [$c0d3], a - ld [$c0d4], a - ld [$c0d5], a + ld [wc0d2], a ; clear RAM + ld [wc0d3], a + ld [wc0d4], a + ld [wc0d5], a .musicChannelDone jp Music8_endchannel -Music8_unknownmusic0xee: ; 21b7b (8:5b7b) - cp $ee ; is this command an unknownmusic0xee? +Music8_stereopanning: ; 21b7b (8:5b7b) + cp $ee ; is this command a stereopanning? jr nz, Music8_unknownmusic0xef ; no call Music8_GetNextMusicByte ; yes - ld [$c004], a ; store first param + ld [wc004], a ; store panning jp Music8_endchannel ; this appears to never be used @@ -510,45 +511,45 @@ Music8_unknownmusic0xef: ; 21b88 (8:5b88) push bc call Func_22035 pop bc - ld a, [$c003] + ld a, [wc003] and a jr nz, .skip - ld a, [$c02d] - ld [$c003], a + ld a, [wc02d] + ld [wc003], a xor a - ld [$c02d], a + ld [wc02d], a .skip jp Music8_endchannel Music8_dutycycle: ; 21ba7 (8:5ba7) cp $fc ; is this command a dutycycle? - jr nz, Music8_stereopanning ; no + jr nz, Music8_volume ; no call Music8_GetNextMusicByte ; yes ld b, $0 - ld hl, $c046 + ld hl, wc046 add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld [hl], a ; store first duty - ld hl, $c02e + ld hl, wc02e add hl, bc set 6, [hl] ; set dutycycle flag jp Music8_endchannel -Music8_stereopanning: ; 21bc5 (8:5bc5) - cp $f0 ; is this command a stereopanning? +Music8_volume: ; 21bc5 (8:5bc5) + cp $f0 ; is this command a volume? jr nz, Music8_executemusic ; no call Music8_GetNextMusicByte ; yes - ld [$ff24], a + ld [$ff24], a ; store volume jp Music8_endchannel Music8_executemusic: ; 21bd1 (8:5bd1) cp $f8 ; is this command an executemusic? jr nz, Music8_octave ; no ld b, $0 ; yes - ld hl, $c036 + ld hl, wc036 add hl, bc set 0, [hl] jp Music8_endchannel @@ -557,7 +558,7 @@ Music8_octave: ; 21be0 (8:5be0) and $f0 cp $e0 ; is this command an octave? jr nz, Music8_unknownsfx0x20 ; no - ld hl, $c0d6 ; yes + ld hl, wc0d6 ; yes ld b, $0 add hl, bc ld a, d @@ -572,14 +573,14 @@ Music8_unknownsfx0x20: ; 21bf3 cp CH3 ; is this a noise or sfx channel? jr c, Music8_unknownsfx0x10 ; no ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music8_unknownsfx0x10 ; no call Music8_notelength ld d, a ld b, $0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld a, [hl] or d @@ -618,7 +619,7 @@ Music8_unknownsfx0x10: ; 21c40 (8:5c40) cp $10 ; is this command a unknownsfx0x10? jr nz, Music8_note ; no ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music8_note ; no @@ -653,7 +654,7 @@ Music8_dnote: ; 21c76 (8:5c76) call Music8_GetNextMusicByte ; get dnote instrument asm_21c7e ld d, a - ld a, [$c003] + ld a, [wc003] and a jr nz, .asm_21c89 ld a, d @@ -670,7 +671,7 @@ Music8_notelength: ; 21c8b (8:5c8b) ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, $c0c6 + ld hl, wc0c6 add hl, bc ld a, [hl] ld l, b @@ -678,9 +679,9 @@ Music8_notelength: ; 21c8b (8:5c8b) ld a, c cp CH4 jr nc, .sfxChannel - ld a, [$c0e8] + ld a, [wc0e8] ld d, a - ld a, [$c0e9] + ld a, [wc0e9] ld e, a jr .skip .sfxChannel @@ -689,31 +690,31 @@ Music8_notelength: ; 21c8b (8:5c8b) cp CH7 jr z, .skip ; if noise channel call Func_21e2f - ld a, [$c0ea] + ld a, [wc0ea] ld d, a - ld a, [$c0eb] + ld a, [wc0eb] ld e, a .skip ld a, l ld b, $0 - ld hl, $c0ce + ld hl, wc0ce add hl, bc ld l, [hl] call Func_22006 ld e, l ld d, h - ld hl, $c0ce + ld hl, wc0ce add hl, bc ld [hl], e ld a, d - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld [hl], a - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music8_notepitch - ld hl, $c02e + ld hl, wc02e add hl, bc bit 2, [hl] jr z, Music8_notepitch @@ -728,7 +729,7 @@ Music8_notepitch: ; 21ce9 (8:5ce9) ld a, c cp CH4 jr nc, .sfxChannel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a @@ -761,12 +762,12 @@ Music8_notepitch: ; 21ce9 (8:5ce9) .notRest swap a ld b, $0 - ld hl, $c0d6 + ld hl, wc0d6 add hl, bc ld b, [hl] call Func_22017 ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc bit 4, [hl] jr z, .asm_21d39 @@ -776,7 +777,7 @@ Music8_notepitch: ; 21ce9 (8:5ce9) ld a, c cp CH4 jr nc, .skip ; if sfx channel - ld hl, $c02a + ld hl, wc02a ld d, $0 ld e, a add hl, de @@ -789,7 +790,7 @@ Music8_notepitch: ; 21ce9 (8:5ce9) ret .skip ld b, $0 - ld hl, $c0de + ld hl, wc0de add hl, bc ld d, [hl] ld b, $2 @@ -799,15 +800,15 @@ Music8_notepitch: ; 21ce9 (8:5ce9) call Func_21d79 pop de ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc - bit 0, [hl] - jr z, .asm_21d70 - inc e - jr nc, .asm_21d70 + bit 0, [hl] ; has toggleperfectpitch been used? + jr z, .skip2 + inc e ; if yes, increment the pitch by 1 + jr nc, .skip2 inc d -.asm_21d70 - ld hl, $c066 +.skip2 + ld hl, wc066 add hl, bc ld [hl], e call Func_21dcc @@ -825,13 +826,13 @@ Func_21d79: ; 21d79 (8:5d79) jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [$c004] + ld a, [wc004] ld hl, Unknown_222e6 add hl, bc and [hl] @@ -849,7 +850,7 @@ Func_21d79: ; 21d79 (8:5d79) Func_21daa: ; 21daa (8:5daa) ld b, $0 - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld d, [hl] ld a, c @@ -860,7 +861,7 @@ Func_21daa: ; 21daa (8:5daa) ld a, d and $3f ld d, a - ld hl, $c03e + ld hl, wc03e add hl, bc ld a, [hl] or d @@ -880,16 +881,16 @@ Func_21dcc: ; 21dcc (8:5dcc) ; fall through .channel3 push de - ld de, $c0e6 + ld de, wc0e6 cp CH2 jr z, .musicChannel3 - ld de, $c0e7 + ld de, wc0e7 .musicChannel3 ld a, [de] add a ld d, $0 ld e, a - ld hl, Music8_Channel3DutyPointers + ld hl, Music8_WavePointers add hl, de ld e, [hl] inc hl @@ -930,13 +931,13 @@ Func_21e19: ; 21e19 (8:5e19) ld a, c cp CH4 jr nz, .asm_21e2e - ld a, [$d083] + ld a, [wd083] bit 7, a jr z, .asm_21e2e xor a - ld [$c0f1], a + ld [wc0f1], a ld a, $80 - ld [$c0f2], a + ld [wc0f2], a .asm_21e2e ret @@ -947,20 +948,20 @@ Func_21e2f: ; 21e2f (8:5e2f) jr nc, .asm_21e4c .asm_21e39 ld d, $0 - ld a, [$c0f2] + ld a, [wc0f2] add $80 jr nc, .asm_21e43 inc d .asm_21e43 - ld [$c0eb], a + ld [wc0eb], a ld a, d - ld [$c0ea], a + ld [wc0ea], a jr .asm_21e55 .asm_21e4c xor a - ld [$c0eb], a + ld [wc0eb], a ld a, $1 - ld [$c0ea], a + ld [wc0ea], a .asm_21e55 ret @@ -970,7 +971,7 @@ Func_21e56: ; 21e56 (8:5e56) call Func_21e9f jr nc, .asm_21e6c .asm_21e60 - ld a, [$c0f1] + ld a, [wc0f1] add e jr nc, .asm_21e67 inc d @@ -986,7 +987,7 @@ Func_21e56: ; 21e56 (8:5e56) Func_21e6d: ; 21e6d (8:5e6d) call Func_21e8b jr nc, .asm_21e88 - ld hl, $c006 + ld hl, wc006 ld e, c ld d, $0 sla e @@ -1007,7 +1008,7 @@ Func_21e6d: ; 21e6d (8:5e6d) ret Func_21e8b: ; 21e8b (8:5e8b) - ld a, [$c02a] + ld a, [wc02a] cp $14 jr nc, .asm_21e94 jr .asm_21e9a @@ -1024,9 +1025,9 @@ Func_21e8b: ; 21e8b (8:5e8b) ret Func_21e9f: ; 21e9f (8:5e9f) - ld a, [$c02d] + ld a, [wc02d] ld b, a - ld a, [$c02a] + ld a, [wc02a] or b cp $9d jr nc, .asm_21ead @@ -1044,27 +1045,27 @@ Func_21e9f: ; 21e9f (8:5e9f) ret Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) - ld hl, $c02e + ld hl, wc02e add hl, bc bit 5, [hl] jp nz, .asm_21eff - ld hl, $c09e + ld hl, wc09e add hl, bc ld e, [hl] - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c07e + ld hl, wc07e add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, $c08e + ld hl, wc08e add hl, bc push hl - ld hl, $c086 + ld hl, wc086 add hl, bc ld a, [hl] pop hl @@ -1076,26 +1077,26 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, $0 adc d ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, [hl] cp d jp c, .asm_21f45 jr nz, .asm_21f32 - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, [hl] cp e jp c, .asm_21f45 jr .asm_21f32 .asm_21eff - ld hl, $c09e + ld hl, wc09e add hl, bc ld a, [hl] - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c07e + ld hl, wc07e add hl, bc ld e, [hl] sub e @@ -1103,7 +1104,7 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, d sbc b ld d, a - ld hl, $c086 + ld hl, wc086 add hl, bc ld a, [hl] add a @@ -1114,22 +1115,22 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) ld a, d sbc b ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, d cp [hl] jr c, .asm_21f45 jr nz, .asm_21f32 - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, e cp [hl] jr c, .asm_21f45 .asm_21f32 - ld hl, $c09e + ld hl, wc09e add hl, bc ld [hl], e - ld hl, $c096 + ld hl, wc096 add hl, bc ld [hl], d ld b, $3 @@ -1139,54 +1140,54 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) ld [hl], d ret .asm_21f45 - ld hl, $c02e + ld hl, wc02e add hl, bc res 4, [hl] res 5, [hl] ret Func_21f4e: ; 21f4e (8:5f4e) - ld hl, $c096 + ld hl, wc096 add hl, bc ld [hl], d - ld hl, $c09e + ld hl, wc09e add hl, bc ld [hl], e - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld a, [hl] - ld hl, $c076 + ld hl, wc076 add hl, bc sub [hl] jr nc, .asm_21f66 ld a, $1 .asm_21f66 ld [hl], a - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc sub [hl] jr c, .asm_21f82 ld d, a ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 5, [hl] jr .asm_21fa5 .asm_21f82 - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c09e + ld hl, wc09e add hl, bc ld e, [hl] - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, [hl] sub e @@ -1194,17 +1195,17 @@ Func_21f4e: ; 21f4e (8:5f4e) ld a, d sbc b ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc res 5, [hl] .asm_21fa5 - ld hl, $c076 + ld hl, wc076 add hl, bc .asm_21fa9 inc b @@ -1223,20 +1224,20 @@ Func_21f4e: ; 21f4e (8:5f4e) add [hl] ld d, b ld b, $0 - ld hl, $c07e + ld hl, wc07e add hl, bc ld [hl], d - ld hl, $c086 + ld hl, wc086 add hl, bc ld [hl], a - ld hl, $c08e + ld hl, wc08e add hl, bc ld [hl], a ret Music8_ApplyDutyCycle: ; 21fcc (8:5fcc) ld b, $0 - ld hl, $c046 + ld hl, wc046 add hl, bc ld a, [hl] rlca @@ -1257,7 +1258,7 @@ Music8_GetNextMusicByte: ; 21fe4 (8:5fe4) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de ld a, [hli] ld e, a @@ -1305,7 +1306,7 @@ Func_22017: ; 22017 (8:6017) add hl, hl ld d, h ld e, l - ld hl, Unknown_222ee + ld hl, Music8_Pitches add hl, de ld e, [hl] inc hl @@ -1325,7 +1326,7 @@ Func_22017: ; 22017 (8:6017) ret Func_22035:: ; 22035 (8:6035) - ld [$c001], a + ld [wc001], a cp $ff jp z, Func_221f3 cp $e9 @@ -1336,63 +1337,63 @@ Func_22035:: ; 22035 (8:6035) jp nc, Func_2210d .asm_2204c xor a - ld [$c000], a - ld [$c003], a - ld [$c0e9], a - ld [$c0e6], a - ld [$c0e7], a + ld [wc000], a + ld [wc003], a + ld [wc0e9], a + ld [wc0e6], a + ld [wc0e7], a ld d, $8 - ld hl, $c016 + ld hl, wc016 call FillMusicRAM8 - ld hl, $c006 + ld hl, wc006 call FillMusicRAM8 ld d, $4 - ld hl, $c026 + ld hl, wc026 call FillMusicRAM8 - ld hl, $c02e + ld hl, wc02e call FillMusicRAM8 - ld hl, $c03e + ld hl, wc03e call FillMusicRAM8 - ld hl, $c046 + ld hl, wc046 call FillMusicRAM8 - ld hl, $c04e + ld hl, wc04e call FillMusicRAM8 - ld hl, $c056 + ld hl, wc056 call FillMusicRAM8 - ld hl, $c05e + ld hl, wc05e call FillMusicRAM8 - ld hl, $c066 + ld hl, wc066 call FillMusicRAM8 - ld hl, $c06e + ld hl, wc06e call FillMusicRAM8 - ld hl, $c036 + ld hl, wc036 call FillMusicRAM8 - ld hl, $c076 + ld hl, wc076 call FillMusicRAM8 - ld hl, $c07e + ld hl, wc07e call FillMusicRAM8 - ld hl, $c086 + ld hl, wc086 call FillMusicRAM8 - ld hl, $c08e + ld hl, wc08e call FillMusicRAM8 - ld hl, $c096 + ld hl, wc096 call FillMusicRAM8 - ld hl, $c09e + ld hl, wc09e call FillMusicRAM8 - ld hl, $c0a6 + ld hl, wc0a6 call FillMusicRAM8 - ld hl, $c0ae + ld hl, wc0ae call FillMusicRAM8 ld a, $1 - ld hl, $c0be + ld hl, wc0be call FillMusicRAM8 - ld hl, $c0b6 + ld hl, wc0b6 call FillMusicRAM8 - ld hl, $c0c6 + ld hl, wc0c6 call FillMusicRAM8 - ld [$c0e8], a + ld [wc0e8], a ld a, $ff - ld [$c004], a + ld [wc004], a xor a ld [$ff24], a ld a, $8 @@ -1417,9 +1418,9 @@ Func_2210d: ; 2210d (8:610d) ld de, SFX_Headers_08 add hl, de ld a, h - ld [$c0ec], a + ld [wc0ec], a ld a, l - ld [$c0ed], a + ld [wc0ed], a ld a, [hl] and $c0 rlca @@ -1432,9 +1433,9 @@ Func_2210d: ; 2210d (8:610d) add c ld c, a ld b, $0 - ld a, [$c0ec] + ld a, [wc0ec] ld h, a - ld a, [$c0ed] + ld a, [wc0ed] ld l, a add hl, bc ld c, d @@ -1442,7 +1443,7 @@ Func_2210d: ; 2210d (8:610d) and $f ld e, a ld d, $0 - ld hl, $c026 + ld hl, wc026 add hl, de ld a, [hl] and a @@ -1450,7 +1451,7 @@ Func_2210d: ; 2210d (8:610d) ld a, e cp $7 jr nz, .asm_22159 - ld a, [$c001] + ld a, [wc001] cp $14 jr nc, .asm_22152 ret @@ -1460,7 +1461,7 @@ Func_2210d: ; 2210d (8:610d) jr z, .asm_22162 jr c, .asm_22162 .asm_22159 - ld a, [$c001] + ld a, [wc001] cp [hl] jr z, .asm_22162 jr c, .asm_22162 @@ -1473,77 +1474,77 @@ Func_2210d: ; 2210d (8:610d) add hl, hl ld d, h ld e, l - ld hl, $c016 + ld hl, wc016 add hl, de ld [hli], a ld [hl], a - ld hl, $c006 + ld hl, wc006 add hl, de ld [hli], a ld [hl], a pop de - ld hl, $c026 + ld hl, wc026 add hl, de ld [hl], a - ld hl, $c02e + ld hl, wc02e add hl, de ld [hl], a - ld hl, $c03e + ld hl, wc03e add hl, de ld [hl], a - ld hl, $c046 + ld hl, wc046 add hl, de ld [hl], a - ld hl, $c04e + ld hl, wc04e add hl, de ld [hl], a - ld hl, $c056 + ld hl, wc056 add hl, de ld [hl], a - ld hl, $c05e + ld hl, wc05e add hl, de ld [hl], a - ld hl, $c066 + ld hl, wc066 add hl, de ld [hl], a - ld hl, $c06e + ld hl, wc06e add hl, de ld [hl], a - ld hl, $c076 + ld hl, wc076 add hl, de ld [hl], a - ld hl, $c07e + ld hl, wc07e add hl, de ld [hl], a - ld hl, $c086 + ld hl, wc086 add hl, de ld [hl], a - ld hl, $c08e + ld hl, wc08e add hl, de ld [hl], a - ld hl, $c096 + ld hl, wc096 add hl, de ld [hl], a - ld hl, $c09e + ld hl, wc09e add hl, de ld [hl], a - ld hl, $c0a6 + ld hl, wc0a6 add hl, de ld [hl], a - ld hl, $c0ae + ld hl, wc0ae add hl, de ld [hl], a - ld hl, $c036 + ld hl, wc036 add hl, de ld [hl], a ld a, $1 - ld hl, $c0be + ld hl, wc0be add hl, de ld [hl], a - ld hl, $c0b6 + ld hl, wc0b6 add hl, de ld [hl], a - ld hl, $c0c6 + ld hl, wc0c6 add hl, de ld [hl], a ld a, e @@ -1577,24 +1578,24 @@ Func_221f3: ; 221f3 (8:61f3) ld a, $77 ld [$ff24], a xor a - ld [$c000], a - ld [$c003], a - ld [$c002], a - ld [$c0e9], a - ld [$c0eb], a - ld [$c0e6], a - ld [$c0e7], a + ld [wc000], a + ld [wc003], a + ld [wc002], a + ld [wc0e9], a + ld [wc0eb], a + ld [wc0e6], a + ld [wc0e7], a ld d, $a0 - ld hl, $c006 + ld hl, wc006 call FillMusicRAM8 ld a, $1 ld d, $18 - ld hl, $c0b6 + ld hl, wc0b6 call FillMusicRAM8 - ld [$c0e8], a - ld [$c0ea], a + ld [wc0e8], a + ld [wc0ea], a ld a, $ff - ld [$c004], a + ld [wc004], a ret ; fills d bytes at hl with a @@ -1607,7 +1608,7 @@ FillMusicRAM8: ; 22248 (8:6248) ret Func_2224e: ; 2224e (8:624e) - ld a, [$c001] + ld a, [wc001] ld l, a ld e, a ld h, $0 @@ -1618,7 +1619,7 @@ Func_2224e: ; 2224e (8:624e) add hl, de ld e, l ld d, h - ld hl, $c006 + ld hl, wc006 ld a, [de] ; get channel number ld b, a rlca @@ -1644,14 +1645,14 @@ Func_2224e: ; 2224e (8:624e) push af ld b, $0 ld c, a - ld hl, $c026 + ld hl, wc026 add hl, bc - ld a, [$c001] + ld a, [wc001] ld [hl], a pop af cp $3 jr c, .asm_22291 - ld hl, $c02e + ld hl, wc02e add hl, bc set 2, [hl] .asm_22291 @@ -1670,32 +1671,32 @@ Func_2224e: ; 2224e (8:624e) ld a, [de] inc de jr nz, .asm_22270 - ld a, [$c001] + ld a, [wc001] cp $14 jr nc, .asm_222aa jr .asm_222d4 .asm_222aa - ld a, [$c001] + ld a, [wc001] cp $86 jr z, .asm_222d4 jr c, .asm_222b5 jr .asm_222d4 .asm_222b5 - ld hl, $c02a + ld hl, wc02a ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, $c012 ; sfx noise channel pointer + ld hl, wc012 ; sfx noise channel pointer ld de, Noise8_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [$c005] + ld a, [wc005] and a jr nz, .asm_222d4 ld a, [$ff24] - ld [$c005], a + ld [wc005], a ld a, $77 ld [$ff24], a .asm_222d4 @@ -1716,18 +1717,18 @@ Unknown_222e6: ; 222e6 (8:62e6) db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Unknown_222ee: ; 222ee (8:62ee) - dw $F82C - dw $F89D - dw $F907 - dw $F96B - dw $F9CA - dw $FA23 - dw $FA77 - dw $FAC7 - dw $FB12 - dw $FB58 - dw $FB9B - dw $FBDA +Music8_Pitches: ; 222ee (8:62ee) + dw $F82C ; C_ + dw $F89D ; C# + dw $F907 ; D_ + dw $F96B ; D# + dw $F9CA ; E_ + dw $FA23 ; F_ + dw $FA77 ; F# + dw $FAC7 ; G_ + dw $FB12 ; G# + dw $FB58 ; A_ + dw $FB9B ; A# + dw $FBDA ; B_ diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 3d5ee66f..fabdecef 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -1,10 +1,10 @@ ; The third of three duplicated sound engines. -Func_7d177:: ; 7d177 (1f:5177) +Music1f_UpdateMusic:: ; 7d177 (1f:5177) ld c, CH0 .loop ld b, $0 - ld hl, $c026 + ld hl, wc026 add hl, bc ld a, [hl] and a @@ -12,13 +12,13 @@ Func_7d177:: ; 7d177 (1f:5177) ld a, c cp CH4 jr nc, .applyAffects ; if sfx channel - ld a, [$c002] + ld a, [wc002] and a jr z, .applyAffects bit 7, a jr nz, .nextChannel set 7, a - ld [$c002], a + ld [wc002], a xor a ld [$ff25], a ld [$ff1a], a @@ -26,7 +26,7 @@ Func_7d177:: ; 7d177 (1f:5177) ld [$ff1a], a jr .nextChannel .applyAffects - call Music1f_Music2_ApplyMusicAffects + call Music1f_ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number @@ -36,53 +36,54 @@ Func_7d177:: ; 7d177 (1f:5177) ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; known flags for $c02e: +; known flags for wc02e: +; 0: toggleperfectpitch has been used ; 1: call has been used ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) +Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld b, $0 - ld hl, $c0b6 ; delay until next note + ld hl, wc0b6 ; delay until next note add hl, bc ld a, [hl] cp $1 ; if delay is 1, play next note - jp z, Music1f_Music2_PlayNextNote + jp z, Music1f_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c cp CH4 jr nc, .startChecks ; if a sfx channel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a jr z, .startChecks ret .startChecks - ld hl, $c02e + ld hl, wc02e add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForExecuteMusic call Music1f_ApplyDutyCycle .checkForExecuteMusic ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, .checkForPitchBend - ld hl, $c02e + ld hl, wc02e add hl, bc bit 2, [hl] jr nz, .disablePitchBendVibrato .checkForPitchBend - ld hl, $c02e + ld hl, wc02e add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay jp Music1f_ApplyPitchBend .checkVibratoDelay - ld hl, $c04e ; vibrato delay + ld hl, wc04e ; vibrato delay add hl, bc ld a, [hl] and a ; check if delay is over @@ -91,7 +92,7 @@ Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) .disablePitchBendVibrato ret .checkForVibrato - ld hl, $c056 ; vibrato rate + ld hl, wc056 ; vibrato rate add hl, bc ld a, [hl] and a @@ -99,7 +100,7 @@ Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) ret ; no vibrato .vibrato ld d, a - ld hl, $c05e + ld hl, wc05e add hl, bc ld a, [hl] and $f @@ -112,10 +113,10 @@ Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) swap [hl] or [hl] ld [hl], a ; reset the vibrato value and start again - ld hl, $c066 + ld hl, wc066 add hl, bc ld e, [hl] ; get note pitch - ld hl, $c02e + ld hl, wc02e add hl, bc bit 3, [hl] ; this is the only code that sets/resets bit three so jr z, .unset ; it continuously alternates which path it takes @@ -147,14 +148,14 @@ Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -Music1f_Music2_PlayNextNote: ; 7d244 (1f:5244) - ld hl, $c06e +Music1f_PlayNextNote: ; 7d244 (1f:5244) + ld hl, wc06e add hl, bc ld a, [hl] - ld hl, $c04e + ld hl, wc04e add hl, bc ld [hl], a - ld hl, $c02e + ld hl, wc02e add hl, bc res 4, [hl] res 5, [hl] @@ -167,7 +168,7 @@ Music1f_endchannel: ; 7d25a (1f:525a) cp $ff ; is this command an endchannel? jp nz, Music1f_callchannel ; no ld b, $0 ; yes - ld hl, $c02e + ld hl, wc02e add hl, bc bit 1, [hl] jr nz, .returnFromCall @@ -177,7 +178,7 @@ Music1f_endchannel: ; 7d25a (1f:525a) jr .asm_7d2b3 .noiseOrSfxChannel res 2, [hl] - ld hl, $c036 + ld hl, wc036 add hl, bc res 0, [hl] cp CH6 @@ -188,11 +189,11 @@ Music1f_endchannel: ; 7d25a (1f:525a) ld [$ff1a], a .notSfxChannel3 jr nz, .asm_7d296 - ld a, [$c003] + ld a, [wc003] and a jr z, .asm_7d296 xor a - ld [$c003], a + ld [wc003], a jr .asm_7d2b3 .asm_7d296 jr .asm_7d2bc @@ -202,10 +203,10 @@ Music1f_endchannel: ; 7d25a (1f:525a) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de push hl ; store current channel address - ld hl, $c016 + ld hl, wc016 add hl, de ld e, l ld d, h @@ -223,12 +224,12 @@ Music1f_endchannel: ; 7d25a (1f:525a) and [hl] ld [$ff25], a .asm_7d2bc - ld a, [$c02a] + ld a, [wc02a] cp $14 jr nc, .asm_7d2c5 jr .asm_7d2e2 .asm_7d2c5 - ld a, [$c02a] + ld a, [wc02a] cp $86 jr z, .asm_7d2e2 jr c, .asm_7d2d0 @@ -240,12 +241,12 @@ Music1f_endchannel: ; 7d25a (1f:525a) call Func_7d73b ret c .asm_7d2d9 - ld a, [$c005] + ld a, [wc005] ld [$ff24], a xor a - ld [$c005], a + ld [wc005], a .asm_7d2e2 - ld hl, $c026 + ld hl, wc026 add hl, bc ld [hl], b ret @@ -264,10 +265,10 @@ Music1f_callchannel: ; 7d2e8 (1f:52e8) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de push hl - ld hl, $c016 + ld hl, wc016 add hl, de ld e, l ld d, h @@ -282,7 +283,7 @@ Music1f_callchannel: ; 7d2e8 (1f:52e8) inc hl ld [hl], d ; overwrite current address with pointer ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 1, [hl] ; set the call flag jp Music1f_endchannel @@ -295,7 +296,7 @@ Music1f_loopchannel: ; 7d31d (1f:531d) and a jr z, .infiniteLoop ld b, $0 - ld hl, $c0be + ld hl, wc0be add hl, bc ld a, [hl] cp e @@ -318,7 +319,7 @@ Music1f_loopchannel: ; 7d31d (1f:531d) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de pop af ld [hli], a @@ -328,11 +329,11 @@ Music1f_loopchannel: ; 7d31d (1f:531d) Music1f_notetype: ; 7d358 (1f:5358) and $f0 cp $d0 ; is this command a notetype? - jp nz, Music1f_togglecall ; no + jp nz, Music1f_toggleperfectpitch ; no ld a, d ; yes and $f ld b, $0 - ld hl, $c0c6 + ld hl, wc0c6 add hl, bc ld [hl], a ; store low nibble as speed ld a, c @@ -345,10 +346,10 @@ Music1f_notetype: ; 7d358 (1f:5358) jr z, .musicChannel3 cp CH6 jr nz, .notChannel3 - ld hl, $c0e7 + ld hl, wc0e7 jr .sfxChannel3 .musicChannel3 - ld hl, $c0e6 + ld hl, wc0e6 .sfxChannel3 ld a, d and $f @@ -363,22 +364,22 @@ Music1f_notetype: ; 7d358 (1f:5358) ; else, store volume (high nibble) and fade (low nibble) .notChannel3 ld b, $0 - ld hl, $c0de + ld hl, wc0de add hl, bc ld [hl], d .noiseChannel jp Music1f_endchannel -Music1f_togglecall: ; 7d397 (1f:5397) +Music1f_toggleperfectpitch: ; 7d397 (1f:5397) ld a, d - cp $e8 ; is this command an togglecall? + cp $e8 ; is this command a toggleperfectpitch? jr nz, Music1f_vibrato ; no ld b, $0 ; yes - ld hl, $c02e + ld hl, wc02e add hl, bc ld a, [hl] xor $1 - ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) + ld [hl], a ; flip bit 0 of wc02e jp Music1f_endchannel Music1f_vibrato: ; 7d3a9 (1f:53a9) @@ -386,10 +387,10 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9) jr nz, Music1f_pitchbend ; no call Music1f_GetNextMusicByte ; yes ld b, $0 - ld hl, $c04e + ld hl, wc04e add hl, bc ld [hl], a ; store delay - ld hl, $c06e + ld hl, wc06e add hl, bc ld [hl], a ; store delay call Music1f_GetNextMusicByte @@ -397,7 +398,7 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9) and $f0 swap a ld b, $0 - ld hl, $c056 + ld hl, wc056 add hl, bc srl a ld e, a @@ -408,7 +409,7 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9) ld a, d and $f ld d, a - ld hl, $c05e + ld hl, wc05e add hl, bc swap a or d @@ -420,7 +421,7 @@ Music1f_pitchbend: ; 7d3e1 (1f:53e1) jr nz, Music1f_duty ; no call Music1f_GetNextMusicByte ; yes ld b, $0 - ld hl, $c076 + ld hl, wc076 add hl, bc ld [hl], a ; store first param call Music1f_GetNextMusicByte @@ -432,14 +433,14 @@ Music1f_pitchbend: ; 7d3e1 (1f:53e1) and $f call Func_7d8cc ld b, $0 - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld [hl], d ; store unknown part of second param - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld [hl], e ; store unknown part of second param ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 4, [hl] ; set pitchbend flag call Music1f_GetNextMusicByte @@ -454,45 +455,45 @@ Music1f_duty: ; 7d419 (1f:5419) rrca and $c0 ld b, $0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld [hl], a ; store duty jp Music1f_endchannel Music1f_tempo: ; 7d42e (1f:542e) cp $ed ; is this command a tempo? - jr nz, Music1f_unknownmusic0xee ; no + jr nz, Music1f_stereopanning ; no ld a, c ; yes cp CH4 jr nc, .sfxChannel call Music1f_GetNextMusicByte - ld [$c0e8], a ; store first param + ld [wc0e8], a ; store first param call Music1f_GetNextMusicByte - ld [$c0e9], a ; store second param + ld [wc0e9], a ; store second param xor a - ld [$c0ce], a ; clear RAM - ld [$c0cf], a - ld [$c0d0], a - ld [$c0d1], a + ld [wc0ce], a ; clear RAM + ld [wc0cf], a + ld [wc0d0], a + ld [wc0d1], a jr .musicChannelDone .sfxChannel call Music1f_GetNextMusicByte - ld [$c0ea], a ; store first param + ld [wc0ea], a ; store first param call Music1f_GetNextMusicByte - ld [$c0eb], a ; store second param + ld [wc0eb], a ; store second param xor a - ld [$c0d2], a ; clear RAM - ld [$c0d3], a - ld [$c0d4], a - ld [$c0d5], a + ld [wc0d2], a ; clear RAM + ld [wc0d3], a + ld [wc0d4], a + ld [wc0d5], a .musicChannelDone jp Music1f_endchannel -Music1f_unknownmusic0xee: ; 7d46e (1f:546e) - cp $ee ; is this command an unknownmusic0xee? +Music1f_stereopanning: ; 7d46e (1f:546e) + cp $ee ; is this command a stereopanning? jr nz, Music1f_unknownmusic0xef ; no call Music1f_GetNextMusicByte ; yes - ld [$c004], a ; store first param + ld [wc004], a ; store panning jp Music1f_endchannel ; this appears to never be used @@ -503,45 +504,45 @@ Music1f_unknownmusic0xef: ; 7d47b (1f:547b) push bc call Func_7d8ea pop bc - ld a, [$c003] + ld a, [wc003] and a jr nz, .skip - ld a, [$c02d] - ld [$c003], a + ld a, [wc02d] + ld [wc003], a xor a - ld [$c02d], a + ld [wc02d], a .skip jp Music1f_endchannel Music1f_dutycycle: ; 7d49a (1f:549a) cp $fc ; is this command a dutycycle? - jr nz, Music1f_stereopanning ; no + jr nz, Music1f_volume ; no call Music1f_GetNextMusicByte ; yes ld b, $0 - ld hl, $c046 + ld hl, wc046 add hl, bc ld [hl], a ; store full cycle and $c0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld [hl], a ; store first duty - ld hl, $c02e + ld hl, wc02e add hl, bc set 6, [hl] ; set duty flag jp Music1f_endchannel -Music1f_stereopanning: ; 7d4b8 (1f:54b8) - cp $f0 ; is this command a stereopanning? +Music1f_volume: ; 7d4b8 (1f:54b8) + cp $f0 ; is this command a volume? jr nz, Music1f_executemusic ; no call Music1f_GetNextMusicByte ; yes - ld [$ff24], a ; store stereopanning + ld [$ff24], a ; store volume jp Music1f_endchannel Music1f_executemusic: ; 7d4c4 (1f:54c4) cp $f8 ; is this command an executemusic? jr nz, Music1f_octave ; no ld b, $0 ; yes - ld hl, $c036 + ld hl, wc036 add hl, bc set 0, [hl] jp Music1f_endchannel @@ -550,7 +551,7 @@ Music1f_octave: ; 7d4d3 (1f:54d3) and $f0 cp $e0 ; is this command an octave? jr nz, Music1f_unknownsfx0x20 ; no - ld hl, $c0d6 ; yes + ld hl, wc0d6 ; yes ld b, $0 add hl, bc ld a, d @@ -565,14 +566,14 @@ Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6) cp CH3 ; is this a noise or sfx channel? jr c, Music1f_unknownsfx0x10 ; no ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music1f_unknownsfx0x10 ; no call Music1f_notelength ; yes ld d, a ld b, $0 - ld hl, $c03e + ld hl, wc03e add hl, bc ld a, [hl] or d @@ -611,7 +612,7 @@ Music1f_unknownsfx0x10 ; 7d533 (1f:5533) cp $10 ; is this command an unknownsfx0x10? jr nz, Music1f_note ; no ld b, $0 - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music1f_note ; no @@ -646,7 +647,7 @@ Music1f_dnote: ; 7d569 (1f:5569) call Music1f_GetNextMusicByte ; get dnote instrument asm_7d571 ld d, a - ld a, [$c003] + ld a, [wc003] and a jr nz, .asm_7d57c ld a, d @@ -663,7 +664,7 @@ Music1f_notelength: ; 7d57e (1f:557e) ld b, $0 ld e, a ; store note length (in 16ths) ld d, b - ld hl, $c0c6 + ld hl, wc0c6 add hl, bc ld a, [hl] ld l, b @@ -671,9 +672,9 @@ Music1f_notelength: ; 7d57e (1f:557e) ld a, c cp CH4 jr nc, .sfxChannel - ld a, [$c0e8] + ld a, [wc0e8] ld d, a - ld a, [$c0e9] + ld a, [wc0e9] ld e, a jr .skip .sfxChannel @@ -682,31 +683,31 @@ Music1f_notelength: ; 7d57e (1f:557e) cp CH7 jr z, .skip ; if noise channel call Func_7d707 - ld a, [$c0ea] + ld a, [wc0ea] ld d, a - ld a, [$c0eb] + ld a, [wc0eb] ld e, a .skip ld a, l ld b, $0 - ld hl, $c0ce + ld hl, wc0ce add hl, bc ld l, [hl] call Func_7d8bb ld e, l ld d, h - ld hl, $c0ce + ld hl, wc0ce add hl, bc ld [hl], e ld a, d - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld [hl], a - ld hl, $c036 + ld hl, wc036 add hl, bc bit 0, [hl] jr nz, Music1f_notepitch - ld hl, $c02e + ld hl, wc02e add hl, bc bit 2, [hl] jr z, Music1f_notepitch @@ -721,7 +722,7 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) ld a, c cp CH4 jr nc, .sfxChannel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a @@ -754,12 +755,12 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) .notRest swap a ld b, $0 - ld hl, $c0d6 + ld hl, wc0d6 add hl, bc ld b, [hl] call Func_7d8cc ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc bit 4, [hl] jr z, .asm_7d62c @@ -769,7 +770,7 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) ld a, c cp CH4 jr nc, .skip ; if sfx Channel - ld hl, $c02a + ld hl, wc02a ld d, $0 ld e, a add hl, de @@ -782,7 +783,7 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) ret .skip ld b, $0 - ld hl, $c0de + ld hl, wc0de add hl, bc ld d, [hl] ld b, $2 @@ -792,15 +793,15 @@ Music1f_notepitch: ; 7d5dc (1f:55dc) call Func_7d66c pop de ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc - bit 0, [hl] - jr z, .asm_7d663 - inc e - jr nc, .asm_7d663 + bit 0, [hl] ; has toggleperfectpitch been used? + jr z, .skip2 + inc e ; if yes, increment the pitch by 1 + jr nc, .skip2 inc d -.asm_7d663 - ld hl, $c066 +.skip2 + ld hl, wc066 add hl, bc ld [hl], e call Func_7d6bf @@ -818,13 +819,13 @@ Func_7d66c: ; 7d66c (1f:566c) jr z, .sfxNoiseChannel cp CH4 jr nc, .skip ; if sfx channel - ld hl, $c02a + ld hl, wc02a add hl, bc ld a, [hl] and a jr nz, .skip .sfxNoiseChannel - ld a, [$c004] + ld a, [wc004] ld hl, Unknown_7db9b add hl, bc and [hl] @@ -842,7 +843,7 @@ Func_7d66c: ; 7d66c (1f:566c) Func_7d69d: ; 7d69d (1f:569d) ld b, $0 - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld d, [hl] ld a, c @@ -853,7 +854,7 @@ Func_7d69d: ; 7d69d (1f:569d) ld a, d and $3f ld d, a - ld hl, $c03e + ld hl, wc03e add hl, bc ld a, [hl] or d @@ -873,16 +874,16 @@ Func_7d6bf: ; 7d6bf (1f:56bf) ; fall through .channel3 push de - ld de, $c0e6 + ld de, wc0e6 cp CH2 jr z, .musicChannel3 - ld de, $c0e7 + ld de, wc0e7 .musicChannel3 ld a, [de] add a ld d, $0 ld e, a - ld hl, Music1f_Channel3DutyPointers + ld hl, Music1f_WavePointers add hl, de ld e, [hl] inc hl @@ -919,27 +920,27 @@ Func_7d707: ; 7d707 (1f:5707) call Func_7d759 jr nc, .asm_7d71f ld d, $0 - ld a, [$c0f2] + ld a, [wc0f2] add $80 jr nc, .asm_7d716 inc d .asm_7d716 - ld [$c0eb], a + ld [wc0eb], a ld a, d - ld [$c0ea], a + ld [wc0ea], a jr .asm_7d728 .asm_7d71f xor a - ld [$c0eb], a + ld [wc0eb], a ld a, $1 - ld [$c0ea], a + ld [wc0ea], a .asm_7d728 ret Func_7d729: ; 7d729 (1f:5729) call Func_7d759 jr nc, .asm_7d73a - ld a, [$c0f1] + ld a, [wc0f1] add e jr nc, .asm_7d735 inc d @@ -955,7 +956,7 @@ Func_7d729: ; 7d729 (1f:5729) Func_7d73b: ; 7d73b (1f:573b) call Func_7d759 jr nc, .asm_7d756 - ld hl, $c006 + ld hl, wc006 ld e, c ld d, $0 sla e @@ -976,7 +977,7 @@ Func_7d73b: ; 7d73b (1f:573b) ret Func_7d759: ; 7d759 (1f:5759) - ld a, [$c02a] + ld a, [wc02a] cp $14 jr nc, .asm_7d762 jr .asm_7d768 @@ -993,27 +994,27 @@ Func_7d759: ; 7d759 (1f:5759) ret Music1f_ApplyPitchBend: ; 7d76d (1f:576d) - ld hl, $c02e + ld hl, wc02e add hl, bc bit 5, [hl] jp nz, .asm_7d7b4 - ld hl, $c09e + ld hl, wc09e add hl, bc ld e, [hl] - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c07e + ld hl, wc07e add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, $c08e + ld hl, wc08e add hl, bc push hl - ld hl, $c086 + ld hl, wc086 add hl, bc ld a, [hl] pop hl @@ -1025,26 +1026,26 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d) ld a, $0 adc d ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, [hl] cp d jp c, .asm_7d7fa jr nz, .asm_7d7e7 - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, [hl] cp e jp c, .asm_7d7fa jr .asm_7d7e7 .asm_7d7b4 - ld hl, $c09e + ld hl, wc09e add hl, bc ld a, [hl] - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c07e + ld hl, wc07e add hl, bc ld e, [hl] sub e @@ -1052,7 +1053,7 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d) ld a, d sbc b ld d, a - ld hl, $c086 + ld hl, wc086 add hl, bc ld a, [hl] add a @@ -1063,22 +1064,22 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d) ld a, d sbc b ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, d cp [hl] jr c, .asm_7d7fa jr nz, .asm_7d7e7 - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, e cp [hl] jr c, .asm_7d7fa .asm_7d7e7 - ld hl, $c09e + ld hl, wc09e add hl, bc ld [hl], e - ld hl, $c096 + ld hl, wc096 add hl, bc ld [hl], d ld b, $3 @@ -1088,54 +1089,54 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d) ld [hl], d ret .asm_7d7fa - ld hl, $c02e + ld hl, wc02e add hl, bc res 4, [hl] res 5, [hl] ret Func_7d803: ; 7d803 (1f:5803) - ld hl, $c096 + ld hl, wc096 add hl, bc ld [hl], d - ld hl, $c09e + ld hl, wc09e add hl, bc ld [hl], e - ld hl, $c0b6 + ld hl, wc0b6 add hl, bc ld a, [hl] - ld hl, $c076 + ld hl, wc076 add hl, bc sub [hl] jr nc, .asm_7d81b ld a, $1 .asm_7d81b ld [hl], a - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc sub [hl] jr c, .asm_7d837 ld d, a ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc set 5, [hl] jr .asm_7d85a .asm_7d837 - ld hl, $c096 + ld hl, wc096 add hl, bc ld d, [hl] - ld hl, $c09e + ld hl, wc09e add hl, bc ld e, [hl] - ld hl, $c0ae + ld hl, wc0ae add hl, bc ld a, [hl] sub e @@ -1143,17 +1144,17 @@ Func_7d803: ; 7d803 (1f:5803) ld a, d sbc b ld d, a - ld hl, $c0a6 + ld hl, wc0a6 add hl, bc ld a, [hl] sub d ld d, a ld b, $0 - ld hl, $c02e + ld hl, wc02e add hl, bc res 5, [hl] .asm_7d85a - ld hl, $c076 + ld hl, wc076 add hl, bc .asm_7d85e inc b @@ -1172,20 +1173,20 @@ Func_7d803: ; 7d803 (1f:5803) add [hl] ld d, b ld b, $0 - ld hl, $c07e + ld hl, wc07e add hl, bc ld [hl], d - ld hl, $c086 + ld hl, wc086 add hl, bc ld [hl], a - ld hl, $c08e + ld hl, wc08e add hl, bc ld [hl], a ret Music1f_ApplyDutyCycle: ; 7d881 (1f:5881) ld b, $0 - ld hl, $c046 + ld hl, wc046 add hl, bc ld a, [hl] rlca @@ -1206,7 +1207,7 @@ Music1f_GetNextMusicByte: ; 7d899 (1f:5899) ld a, c add a ld e, a - ld hl, $c006 + ld hl, wc006 add hl, de ld a, [hli] ld e, a @@ -1254,7 +1255,7 @@ Func_7d8cc: ; 7d8cc (1f:58cc) add hl, hl ld d, h ld e, l - ld hl, Unknown_7dba3 + ld hl, Music1f_Pitches add hl, de ld e, [hl] inc hl @@ -1274,7 +1275,7 @@ Func_7d8cc: ; 7d8cc (1f:58cc) ret Func_7d8ea:: ; 7d8ea (1f:58ea) - ld [$c001], a + ld [wc001], a cp $ff jp z, Func_7daa8 cp $c2 @@ -1285,63 +1286,63 @@ Func_7d8ea:: ; 7d8ea (1f:58ea) jp nc, Func_7d9c2 .asm_7d901 xor a - ld [$c000], a - ld [$c003], a - ld [$c0e9], a - ld [$c0e6], a - ld [$c0e7], a + ld [wc000], a + ld [wc003], a + ld [wc0e9], a + ld [wc0e6], a + ld [wc0e7], a ld d, $8 - ld hl, $c016 + ld hl, wc016 call FillMusicRAM1f - ld hl, $c006 + ld hl, wc006 call FillMusicRAM1f ld d, $4 - ld hl, $c026 + ld hl, wc026 call FillMusicRAM1f - ld hl, $c02e + ld hl, wc02e call FillMusicRAM1f - ld hl, $c03e + ld hl, wc03e call FillMusicRAM1f - ld hl, $c046 + ld hl, wc046 call FillMusicRAM1f - ld hl, $c04e + ld hl, wc04e call FillMusicRAM1f - ld hl, $c056 + ld hl, wc056 call FillMusicRAM1f - ld hl, $c05e + ld hl, wc05e call FillMusicRAM1f - ld hl, $c066 + ld hl, wc066 call FillMusicRAM1f - ld hl, $c06e + ld hl, wc06e call FillMusicRAM1f - ld hl, $c036 + ld hl, wc036 call FillMusicRAM1f - ld hl, $c076 + ld hl, wc076 call FillMusicRAM1f - ld hl, $c07e + ld hl, wc07e call FillMusicRAM1f - ld hl, $c086 + ld hl, wc086 call FillMusicRAM1f - ld hl, $c08e + ld hl, wc08e call FillMusicRAM1f - ld hl, $c096 + ld hl, wc096 call FillMusicRAM1f - ld hl, $c09e + ld hl, wc09e call FillMusicRAM1f - ld hl, $c0a6 + ld hl, wc0a6 call FillMusicRAM1f - ld hl, $c0ae + ld hl, wc0ae call FillMusicRAM1f ld a, $1 - ld hl, $c0be + ld hl, wc0be call FillMusicRAM1f - ld hl, $c0b6 + ld hl, wc0b6 call FillMusicRAM1f - ld hl, $c0c6 + ld hl, wc0c6 call FillMusicRAM1f - ld [$c0e8], a + ld [wc0e8], a ld a, $ff - ld [$c004], a + ld [wc004], a xor a ld [$ff24], a ld a, $8 @@ -1366,9 +1367,9 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) ld de, SFX_Headers_1f add hl, de ld a, h - ld [$c0ec], a + ld [wc0ec], a ld a, l - ld [$c0ed], a + ld [wc0ed], a ld a, [hl] and $c0 rlca @@ -1381,9 +1382,9 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) add c ld c, a ld b, $0 - ld a, [$c0ec] + ld a, [wc0ec] ld h, a - ld a, [$c0ed] + ld a, [wc0ed] ld l, a add hl, bc ld c, d @@ -1391,7 +1392,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) and $f ld e, a ld d, $0 - ld hl, $c026 + ld hl, wc026 add hl, de ld a, [hl] and a @@ -1399,7 +1400,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) ld a, e cp $7 jr nz, .asm_7da0e - ld a, [$c001] + ld a, [wc001] cp $14 jr nc, .asm_7da07 ret @@ -1409,7 +1410,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) jr z, .asm_7da17 jr c, .asm_7da17 .asm_7da0e - ld a, [$c001] + ld a, [wc001] cp [hl] jr z, .asm_7da17 jr c, .asm_7da17 @@ -1422,77 +1423,77 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) add hl, hl ld d, h ld e, l - ld hl, $c016 + ld hl, wc016 add hl, de ld [hli], a ld [hl], a - ld hl, $c006 + ld hl, wc006 add hl, de ld [hli], a ld [hl], a pop de - ld hl, $c026 + ld hl, wc026 add hl, de ld [hl], a - ld hl, $c02e + ld hl, wc02e add hl, de ld [hl], a - ld hl, $c03e + ld hl, wc03e add hl, de ld [hl], a - ld hl, $c046 + ld hl, wc046 add hl, de ld [hl], a - ld hl, $c04e + ld hl, wc04e add hl, de ld [hl], a - ld hl, $c056 + ld hl, wc056 add hl, de ld [hl], a - ld hl, $c05e + ld hl, wc05e add hl, de ld [hl], a - ld hl, $c066 + ld hl, wc066 add hl, de ld [hl], a - ld hl, $c06e + ld hl, wc06e add hl, de ld [hl], a - ld hl, $c076 + ld hl, wc076 add hl, de ld [hl], a - ld hl, $c07e + ld hl, wc07e add hl, de ld [hl], a - ld hl, $c086 + ld hl, wc086 add hl, de ld [hl], a - ld hl, $c08e + ld hl, wc08e add hl, de ld [hl], a - ld hl, $c096 + ld hl, wc096 add hl, de ld [hl], a - ld hl, $c09e + ld hl, wc09e add hl, de ld [hl], a - ld hl, $c0a6 + ld hl, wc0a6 add hl, de ld [hl], a - ld hl, $c0ae + ld hl, wc0ae add hl, de ld [hl], a - ld hl, $c036 + ld hl, wc036 add hl, de ld [hl], a ld a, $1 - ld hl, $c0be + ld hl, wc0be add hl, de ld [hl], a - ld hl, $c0b6 + ld hl, wc0b6 add hl, de ld [hl], a - ld hl, $c0c6 + ld hl, wc0c6 add hl, de ld [hl], a ld a, e @@ -1526,24 +1527,24 @@ Func_7daa8: ; 7daa8 (1f:5aa8) ld a, $77 ld [$ff24], a xor a - ld [$c000], a - ld [$c003], a - ld [$c002], a - ld [$c0e9], a - ld [$c0eb], a - ld [$c0e6], a - ld [$c0e7], a + ld [wc000], a + ld [wc003], a + ld [wc002], a + ld [wc0e9], a + ld [wc0eb], a + ld [wc0e6], a + ld [wc0e7], a ld d, $a0 - ld hl, $c006 + ld hl, wc006 call FillMusicRAM1f ld a, $1 ld d, $18 - ld hl, $c0b6 + ld hl, wc0b6 call FillMusicRAM1f - ld [$c0e8], a - ld [$c0ea], a + ld [wc0e8], a + ld [wc0ea], a ld a, $ff - ld [$c004], a + ld [wc004], a ret ; fills d bytes at hl with a @@ -1556,7 +1557,7 @@ FillMusicRAM1f: ; 7dafd (1f:5afd) ret Func_7db03: ; 7db03 (1f:5b03) - ld a, [$c001] + ld a, [wc001] ld l, a ld e, a ld h, $0 @@ -1567,7 +1568,7 @@ Func_7db03: ; 7db03 (1f:5b03) add hl, de ld e, l ld d, h - ld hl, $c006 + ld hl, wc006 ld a, [de] ; get channel number ld b, a rlca @@ -1593,14 +1594,14 @@ Func_7db03: ; 7db03 (1f:5b03) push af ld b, $0 ld c, a - ld hl, $c026 + ld hl, wc026 add hl, bc - ld a, [$c001] + ld a, [wc001] ld [hl], a pop af cp $3 jr c, .asm_7db46 - ld hl, $c02e + ld hl, wc02e add hl, bc set 2, [hl] .asm_7db46 @@ -1619,32 +1620,32 @@ Func_7db03: ; 7db03 (1f:5b03) ld a, [de] inc de jr nz, .asm_7db25 - ld a, [$c001] + ld a, [wc001] cp $14 jr nc, .asm_7db5f jr .asm_7db89 .asm_7db5f - ld a, [$c001] + ld a, [wc001] cp $86 jr z, .asm_7db89 jr c, .asm_7db6a jr .asm_7db89 .asm_7db6a - ld hl, $c02a + ld hl, wc02a ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, $c012 ; sfx noise channel pointer + ld hl, wc012 ; sfx noise channel pointer ld de, Noise1f_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel - ld a, [$c005] + ld a, [wc005] and a jr nz, .asm_7db89 ld a, [$ff24] - ld [$c005], a + ld [wc005], a ld a, $77 ld [$ff24], a .asm_7db89 @@ -1665,18 +1666,18 @@ Unknown_7db9b: ; 7db9b (1f:5b9b) db $11, $22, $44, $88 ; channels 0-3 db $11, $22, $44, $88 ; channels 4-7 -Unknown_7dba3: ; 7dba3 (1f:5ba3) - dw $F82C - dw $F89D - dw $F907 - dw $F96B - dw $F9CA - dw $FA23 - dw $FA77 - dw $FAC7 - dw $FB12 - dw $FB58 - dw $FB9B - dw $FBDA +Music1f_Pitches: ; 7dba3 (1f:5ba3) + dw $F82C ; C_ + dw $F89D ; C# + dw $F907 ; D_ + dw $F96B ; D# + dw $F9CA ; E_ + dw $FA23 ; F_ + dw $FA77 ; F# + dw $FAC7 ; G_ + dw $FB12 ; G# + dw $FB58 ; A_ + dw $FB9B ; A# + dw $FBDA ; B_ diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm index 3adb23c5..dd5b4b5b 100644 --- a/audio/headers/musicheaders02.asm +++ b/audio/headers/musicheaders02.asm @@ -182,5 +182,5 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1) dw Music_IndigoPlateau_Ch3 db CH3 dw Music_IndigoPlateau_Ch4 - + ; 0x82fd
\ No newline at end of file diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm index fbc3f9ae..b4ef7375 100644 --- a/audio/headers/musicheaders08.asm +++ b/audio/headers/musicheaders08.asm @@ -53,5 +53,5 @@ Music_DefeatedGymLeader:: ; 202f4 (8:42f4) dw Music_DefeatedGymLeader_Ch2 db CH2 dw Music_DefeatedGymLeader_Ch3 - + ; 202fd
\ No newline at end of file diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index 13776fe1..662f2fc8 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,153 +1,153 @@ Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 5 octave 3 - note G_, 2 + G_ 2 Music_BikeRiding_branch_7dbc9:: octave 4 - note C_, 4 - note D_, 4 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 4 - note E_, 2 - note D_, 2 - note F_, 4 - note D_, 4 + C_ 4 + D_ 4 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 4 + E_ 2 + D_ 2 + F_ 4 + D_ 4 octave 3 - note B_, 2 - octave 4 - note F_, 4 - note D_, 4 - note E_, 2 - note F_, 2 - note G_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 + B_ 2 + octave 4 + F_ 4 + D_ 4 + E_ 2 + F_ 2 + G_ 2 + C_ 2 + E_ 2 + C_ 2 + D_ 2 + E_ 2 notetype 12, 11, 6 - note F_, 10 + F_ 10 notetype 12, 10, 6 - note F_, 2 - note E_, 2 - note F_, 2 - note G_, 10 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 6 - togglecall + F_ 2 + E_ 2 + F_ 2 + G_ 10 + E_ 2 + D_ 2 + E_ 2 + F_ 6 + toggleperfectpitch notetype 12, 11, 3 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 2 - note E_, 1 - note F_, 1 - togglecall + E_ 2 + D_ 2 + D_ 1 + E_ 1 + F_ 2 + E_ 1 + F_ 1 + toggleperfectpitch notetype 12, 11, 5 - note G_, 6 - note G_, 6 - note A_, 2 - note F_, 2 - note G_, 6 + G_ 6 + G_ 6 + A_ 2 + F_ 2 + G_ 6 notetype 12, 11, 4 - note G_, 2 - note F_, 4 + G_ 2 + F_ 4 notetype 12, 10, 4 - note E_, 2 - note D_, 2 + E_ 2 + D_ 2 notetype 12, 9, 3 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 4 - note C_, 2 + C_ 4 + C_ 2 octave 3 - note B_, 2 - note A_, 1 - note B_, 1 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note C_, 4 - note C_, 2 + B_ 2 + A_ 1 + B_ 1 + A_ 2 + B_ 2 + octave 4 + C_ 2 + C_ 4 + C_ 2 octave 3 - note A_, 2 - note B_, 2 - note B_, 2 - note A_, 2 + A_ 2 + B_ 2 + B_ 2 + A_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 2 - note B_, 1 + A_ 2 + B_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 2 + B_ 2 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note D_, 1 + C_ 1 + D_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 4 + C_ 4 notetype 12, 3, 13 - note C_, 4 + C_ 4 notetype 12, 11, 4 - note F_, 6 - note G_, 4 - note F_, 1 - note G_, 1 - note F_, 4 - note E_, 6 - note F_, 2 - note E_, 2 - note D_, 1 - note E_, 1 - note D_, 2 - note C_, 2 + F_ 6 + G_ 4 + F_ 1 + G_ 1 + F_ 4 + E_ 6 + F_ 2 + E_ 2 + D_ 1 + E_ 1 + D_ 2 + C_ 2 notetype 12, 11, 5 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note C_, 4 - note F_, 4 - note D_, 4 - note F#, 4 + E_ 4 + C_ 4 + F_ 4 + D_ 4 + F# 4 vibrato 10, 2, 6 notetype 12, 8, 0 - note G_, 16 - note G_, 4 + G_ 16 + G_ 4 notetype 12, 8, 7 - note G_, 12 + G_ 12 notetype 12, 11, 5 vibrato 8, 1, 4 loopchannel 0, Music_BikeRiding_branch_7dbc9 @@ -158,146 +158,146 @@ Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c) vibrato 6, 1, 5 notetype 12, 12, 3 octave 4 - note C_, 2 + C_ 2 Music_BikeRiding_branch_7dc75:: - note E_, 4 - note F_, 4 - note G_, 4 + E_ 4 + F_ 4 + G_ 4 octave 5 - note C_, 4 - octave 4 - note B_, 6 - note A_, 1 - note B_, 1 - note A_, 10 - note F_, 2 - note G_, 2 - note A_, 2 + C_ 4 + octave 4 + B_ 6 + A_ 1 + B_ 1 + A_ 10 + F_ 2 + G_ 2 + A_ 2 octave 5 - note D_, 2 - note C_, 2 + D_ 2 + C_ 2 octave 4 - note B_, 2 - note A_, 1 - note B_, 1 + B_ 2 + A_ 1 + B_ 1 octave 5 - note C_, 6 + C_ 6 octave 4 - note A_, 2 - note G_, 4 + A_ 2 + G_ 4 duty 3 notetype 12, 8, 4 - note A#, 6 + A# 6 duty 2 notetype 12, 12, 5 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note A_, 10 + A_ 10 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 10 + G_ 10 notetype 12, 12, 3 octave 5 - note C_, 4 - note E_, 2 - note D_, 2 - note C_, 2 + C_ 4 + E_ 2 + D_ 2 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 notetype 12, 11, 0 - note D_, 4 + D_ 4 notetype 12, 12, 7 - note D_, 10 - note D_, 1 - note C_, 1 + D_ 10 + D_ 1 + C_ 1 notetype 12, 11, 0 octave 4 - note B_, 4 + B_ 4 notetype 12, 12, 7 - note B_, 12 + B_ 12 notetype 12, 12, 4 - note F_, 6 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 6 - note E_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note G_, 4 - note A_, 2 - note F_, 2 - note E_, 2 - note G_, 4 - note F_, 2 - note E_, 6 + F_ 6 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 6 + E_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + F_ 2 + E_ 2 + D_ 2 + F_ 2 + G_ 4 + A_ 2 + F_ 2 + E_ 2 + G_ 4 + F_ 2 + E_ 6 notetype 6, 12, 2 - note F_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F_ 1 + G_ 1 + A_ 1 + B_ 1 notetype 12, 12, 3 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 5 - note C_, 2 - octave 4 - note B_, 4 - note A_, 4 - note G_, 2 - note A#, 4 - note A_, 2 - note G_, 4 - note F_, 2 - note E_, 2 + C_ 2 + octave 4 + B_ 4 + A_ 4 + G_ 2 + A# 4 + A_ 2 + G_ 4 + F_ 2 + E_ 2 notetype 8, 12, 4 - note A_, 4 - note G_, 4 - note F_, 4 - note B_, 4 - note A_, 4 - note G_, 4 + A_ 4 + G_ 4 + F_ 4 + B_ 4 + A_ 4 + G_ 4 octave 5 - note C_, 4 + C_ 4 octave 4 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 5 - note D_, 4 - note E_, 4 - note C_, 4 + D_ 4 + E_ 4 + C_ 4 notetype 12, 12, 7 - note D_, 12 - note C_, 4 + D_ 12 + C_ 4 notetype 12, 11, 0 octave 4 - note B_, 4 + B_ 4 notetype 12, 12, 7 - note B_, 12 + B_ 12 notetype 12, 12, 3 loopchannel 0, Music_BikeRiding_branch_7dc75 @@ -308,337 +308,337 @@ Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14) Music_BikeRiding_branch_7dd17:: octave 4 - note C_, 1 + C_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note G_, 1 + G_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 loopchannel 0, Music_BikeRiding_branch_7dd17 @@ -671,35 +671,35 @@ Music_BikeRiding_branch_7de6a:: Music_BikeRiding_branch_7dea7:: rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 endchannel Music_BikeRiding_branch_7deb4:: rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 - dnote 2, triangle3 - dnote 2, triangle3 + triangle3 2 + triangle3 2 + triangle3 2 endchannel Music_BikeRiding_branch_7dec2:: rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 2, triangle3 + triangle3 2 rest 2 - dnote 1, triangle3 - dnote 1, triangle3 + triangle3 1 + triangle3 1 endchannel -; 0x7ded1
\ No newline at end of file +; 0x7ded1 diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index a965bc80..77dc2ab8 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,109 +1,109 @@ Music_Celadon_Ch1:: ; b6c7 (2:76c7) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch notetype 12, 2, 15 rest 8 octave 3 - note D_, 8 + D_ 8 Music_Celadon_branch_b6d4:: duty 2 notetype 12, 11, 2 - note G_, 4 - note B_, 4 - note G_, 2 - note B_, 4 - note G_, 2 - note E_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note B_, 2 - octave 4 - note C_, 2 + G_ 4 + B_ 4 + G_ 2 + B_ 4 + G_ 2 + E_ 1 + E_ 1 + G_ 1 + E_ 1 + B_ 2 + octave 4 + C_ 2 octave 3 - note A_, 8 - note F#, 4 - note A_, 4 - note F#, 2 - note A_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 1 + A_ 8 + F# 4 + A_ 4 + F# 2 + A_ 6 + A_ 1 + B_ 1 + octave 4 + C_ 1 octave 3 - note B_, 1 - note A_, 2 - note B_, 2 - note G_, 4 + B_ 1 + A_ 2 + B_ 2 + G_ 4 octave 4 - note G_, 4 + G_ 4 octave 3 - note G_, 4 - note B_, 4 - note G_, 2 - note B_, 4 - note G_, 2 - note E_, 1 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 2 - octave 4 - note C_, 2 + G_ 4 + B_ 4 + G_ 2 + B_ 4 + G_ 2 + E_ 1 + F# 1 + G_ 1 + A_ 1 + B_ 2 + octave 4 + C_ 2 octave 3 - note A_, 8 - note A_, 2 - note B_, 2 + A_ 8 + A_ 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note F#, 4 - note D_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note A_, 8 + B_ 2 + A_ 2 + G_ 2 + F# 2 + G_ 2 + F# 4 + D_ 1 + E_ 1 + F# 1 + G_ 1 + A_ 8 notetype 12, 9, 4 - note B_, 8 - note G_, 4 - note D_, 4 - note G_, 4 - note A_, 2 + B_ 8 + G_ 4 + D_ 4 + G_ 4 + A_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note B_, 8 - note A_, 8 - note F#, 4 - note G_, 4 - note A_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - note B_, 8 - note G_, 4 - note D_, 4 - note G_, 4 - note A_, 2 - octave 4 - note C_, 2 + B_ 8 + A_ 8 + F# 4 + G_ 4 + A_ 4 + G_ 4 + F# 4 + A_ 4 + B_ 8 + G_ 4 + D_ 4 + G_ 4 + A_ 2 + octave 4 + C_ 2 octave 3 - note B_, 8 - note A_, 8 - note F#, 4 - note G_, 4 - note A_, 4 - note G_, 4 - note F#, 4 - note A_, 4 + B_ 8 + A_ 8 + F# 4 + G_ 4 + A_ 4 + G_ 4 + F# 4 + A_ 4 loopchannel 0, Music_Celadon_branch_b6d4 @@ -111,118 +111,118 @@ Music_Celadon_Ch2:: ; b73a (2:773a) duty 3 notetype 12, 12, 2 octave 4 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 + D_ 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + E_ 1 + F# 1 + G_ 1 notetype 12, 10, 0 - note A_, 8 + A_ 8 Music_Celadon_branch_b74a:: duty 2 notetype 12, 12, 2 octave 4 - note B_, 4 - note G_, 4 - note B_, 2 - note G_, 6 - note B_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + B_ 4 + G_ 4 + B_ 2 + G_ 6 + B_ 1 + G_ 1 + A_ 1 + B_ 1 octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 8 - note A_, 4 - note F#, 4 - note A_, 2 - note F#, 6 - note A_, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note A_, 2 - note B_, 2 - note G_, 4 - note B_, 4 - note B_, 4 - note G_, 4 - note B_, 2 - note G_, 4 + C_ 2 + octave 4 + B_ 2 + A_ 8 + A_ 4 + F# 4 + A_ 2 + F# 6 + A_ 1 + G_ 1 + F# 1 + G_ 1 + A_ 2 + B_ 2 + G_ 4 + B_ 4 + B_ 4 + G_ 4 + B_ 2 + G_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note B_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + B_ 1 + G_ 1 + A_ 1 + B_ 1 octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 8 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 8 + C_ 2 + octave 4 + B_ 2 + A_ 8 + A_ 2 + G_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C# 2 + D_ 8 octave 5 - note D_, 8 + D_ 8 notetype 12, 11, 4 octave 4 - note D_, 8 - note C_, 2 + D_ 8 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 4 - note F#, 4 - note D_, 8 - note C_, 8 + B_ 2 + A_ 2 + B_ 2 + octave 4 + E_ 4 + F# 4 + D_ 8 + C_ 8 octave 3 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note D_, 8 - note D_, 8 - note C_, 2 + A_ 2 + B_ 2 + octave 4 + C_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + E_ 2 + D_ 8 + D_ 8 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 8 - note C_, 8 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 8 + B_ 2 + A_ 2 + B_ 2 + octave 4 + E_ 4 + D_ 2 + E_ 2 + D_ 8 + C_ 8 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + D_ 8 loopchannel 0, Music_Celadon_branch_b74a @@ -230,183 +230,183 @@ Music_Celadon_Ch3:: ; b7b5 (2:77b5) notetype 12, 1, 3 rest 8 octave 5 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 + D_ 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + E_ 1 + F# 1 + G_ 1 Music_Celadon_branch_b7c1:: octave 4 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note C#, 2 - note D_, 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + B_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + C# 2 + D_ 2 rest 6 - note F#, 2 + F# 2 rest 4 - note F#, 2 - note G_, 2 + F# 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 - note B_, 2 - note G_, 2 + G_ 2 + B_ 2 + G_ 2 octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 octave 4 - note B_, 2 - note G_, 2 + B_ 2 + G_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 octave 4 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 - note B_, 2 - note G_, 2 + G_ 2 + B_ 2 + G_ 2 octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 octave 4 - note B_, 2 - note G_, 2 + B_ 2 + G_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 + D_ 2 + C_ 2 + octave 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 loopchannel 0, Music_Celadon_branch_b7c1 -; 0xb86d
\ No newline at end of file +; 0xb86d diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index db344c64..4fcbe842 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,87 +1,87 @@ Music_Cinnabar_Ch1:: ; b86d (2:786d) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 3 vibrato 12, 3, 4 - togglecall + toggleperfectpitch Music_Cinnabar_branch_b878:: notetype 12, 11, 5 rest 4 octave 3 - note D_, 4 - note E_, 6 - note C#, 2 + D_ 4 + E_ 6 + C# 2 notetype 12, 11, 1 - note D_, 4 + D_ 4 notetype 12, 11, 5 - note B_, 4 + B_ 4 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 2 + A_ 2 notetype 12, 11, 1 - note B_, 4 + B_ 4 notetype 12, 11, 5 - note G_, 4 - note F#, 4 - note E_, 2 - note F#, 2 + G_ 4 + F# 4 + E_ 2 + F# 2 notetype 12, 11, 1 - note G_, 4 + G_ 4 notetype 12, 11, 5 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note F#, 6 - note A_, 2 + G_ 4 + F# 4 + E_ 4 + D_ 4 + E_ 4 + F# 6 + A_ 2 notetype 12, 11, 1 - note G_, 4 + G_ 4 notetype 12, 11, 5 - note B_, 4 + B_ 4 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 2 - note B_, 4 - note G_, 4 - note F#, 3 - note E_, 1 - note F#, 2 - note A_, 2 + A_ 2 + B_ 4 + G_ 4 + F# 3 + E_ 1 + F# 2 + A_ 2 notetype 12, 10, 2 - note G_, 4 + G_ 4 octave 4 - note D_, 1 - note E_, 1 - note D_, 4 + D_ 1 + E_ 1 + D_ 4 notetype 12, 7, 2 - note D_, 1 - note E_, 1 - note D_, 4 + D_ 1 + E_ 1 + D_ 4 notetype 12, 10, 7 octave 3 - note B_, 6 - note G_, 2 - note E_, 8 + B_ 6 + G_ 2 + E_ 8 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 2 - note F#, 8 + A_ 2 + F# 8 octave 4 - note F#, 6 - note D_, 2 + F# 6 + D_ 2 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 4 - note E_, 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 + G_ 8 + F# 4 + E_ 4 loopchannel 0, Music_Cinnabar_branch_b878 @@ -92,90 +92,90 @@ Music_Cinnabar_Ch2:: ; b8d4 (2:78d4) Music_Cinnabar_branch_b8d9:: notetype 12, 12, 7 octave 3 - note G_, 6 - note A_, 1 - note B_, 1 + G_ 6 + A_ 1 + B_ 1 octave 4 - note C_, 6 - note D_, 1 - note E_, 1 + C_ 6 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 + G_ 4 + A_ 6 + G_ 1 + F# 1 + E_ 4 + D_ 4 + C_ 3 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 2 - note D_, 1 - note E_, 1 + C_ 2 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 octave 3 - note B_, 8 - note A_, 4 - note G_, 6 - note A_, 1 - note B_, 1 + B_ 8 + A_ 4 + G_ 6 + A_ 1 + B_ 1 octave 4 - note C_, 6 - note D_, 1 - note E_, 1 + C_ 6 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 + G_ 4 + A_ 6 + G_ 1 + F# 1 + E_ 4 + D_ 4 + C_ 3 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 2 - note D_, 1 - note E_, 1 + C_ 2 + D_ 1 + E_ 1 notetype 12, 12, 1 - note D_, 4 + D_ 4 notetype 12, 12, 7 octave 3 - note A_, 4 - note G_, 4 - note F#, 4 + A_ 4 + G_ 4 + F# 4 notetype 12, 11, 0 octave 4 - note D_, 6 + D_ 6 octave 3 - note B_, 2 - note G_, 8 + B_ 2 + G_ 8 octave 4 - note E_, 6 - note C_, 2 + E_ 6 + C_ 2 octave 3 - note A_, 8 + A_ 8 octave 4 - note A_, 6 - note F#, 2 - note D_, 2 - note C_, 2 + A_ 6 + F# 2 + D_ 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 4 + B_ 2 + A_ 2 + B_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 2 - note A_, 6 + B_ 2 + A_ 6 loopchannel 0, Music_Cinnabar_branch_b8d9 @@ -184,172 +184,172 @@ Music_Cinnabar_Ch3:: ; b93d (2:793d) Music_Cinnabar_branch_b93f:: octave 4 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 + B_ 2 + G_ 1 + G_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note B_, 4 - note A_, 1 + B_ 4 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note B_, 1 + B_ 1 rest 3 octave 5 - note D_, 2 + D_ 2 octave 4 - note B_, 1 - note B_, 1 - note B_, 1 + B_ 1 + B_ 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 1 + B_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 octave 5 - note E_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + E_ 2 + C_ 1 + C_ 1 + C_ 1 rest 1 - note C_, 1 + C_ 1 rest 1 - note E_, 2 - note C_, 1 + E_ 2 + C_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 3 octave 5 - note A_, 2 - note F#, 1 - note F#, 1 - note D_, 1 + A_ 2 + F# 1 + F# 1 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D_, 2 - note C_, 1 + D_ 2 + C_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 3 octave 5 - note D_, 2 - note C_, 1 - note C_, 1 + D_ 2 + C_ 1 + C_ 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 2 + A_ 2 octave 5 - note C_, 1 + C_ 1 rest 1 loopchannel 0, Music_Cinnabar_branch_b93f -; 0xb9eb
\ No newline at end of file +; 0xb9eb diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 1560e89d..690fb915 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -1,29 +1,29 @@ Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 vibrato 11, 2, 5 duty 2 Music_CinnabarMansion_branch_7ed19:: notetype 12, 6, 2 octave 5 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 4 - note B_, 1 - note B_, 1 - note C_, 1 + B_ 1 + B_ 1 + C_ 1 rest 2 octave 5 - note B_, 2 - note E_, 2 + B_ 2 + E_ 2 octave 4 - note C_, 2 - note B_, 2 - note E_, 2 - note C_, 1 + C_ 2 + B_ 2 + E_ 2 + C_ 1 octave 5 - note B_, 1 + B_ 1 rest 2 loopchannel 14, Music_CinnabarMansion_branch_7ed19 notetype 12, 10, 5 @@ -31,16 +31,16 @@ Music_CinnabarMansion_branch_7ed19:: rest 16 rest 15 octave 4 - note C_, 1 + C_ 1 octave 5 - note B_, 1 - note B_, 2 + B_ 1 + B_ 2 loopchannel 0, Music_CinnabarMansion_branch_7ed19 Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40) duty 2 - togglecall + toggleperfectpitch vibrato 10, 2, 4 notetype 12, 12, 2 @@ -56,42 +56,42 @@ Music_CinnabarMansion_branch_7ed50:: callchannel Music_CinnabarMansion_branch_7ed6c loopchannel 3, Music_CinnabarMansion_branch_7ed50 octave 3 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 rest 4 - note A#, 4 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - note G_, 4 - note D#, 4 + A# 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 + G_ 4 + D# 4 loopchannel 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - note A_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 + A_ 4 + A# 4 + E_ 4 + D# 4 + B_ 4 + A# 4 + G_ 4 + G# 4 rest 4 - note A#, 4 + A# 4 endchannel @@ -100,46 +100,46 @@ Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e) Music_CinnabarMansion_branch_7ed80:: octave 2 - note B_, 2 + B_ 2 rest 2 octave 3 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note C_, 2 + C_ 2 rest 2 octave 3 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D#, 2 + D# 2 rest 2 loopchannel 8, Music_CinnabarMansion_branch_7ed80 - note E_, 16 - note D#, 16 - note G_, 16 - note G#, 8 - note D#, 8 + E_ 16 + D# 16 + G_ 16 + G# 8 + D# 8 loopchannel 0, Music_CinnabarMansion_branch_7ed80 @@ -151,23 +151,23 @@ Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0) rest 16 Music_CinnabarMansion_branch_7edb5:: - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 - dnote 4, cymbal3 - dnote 2, cymbal1 - dnote 2, cymbal1 + cymbal1 2 + cymbal1 2 + cymbal2 4 + cymbal1 2 + cymbal1 2 + cymbal2 4 + cymbal1 2 + cymbal1 2 + cymbal2 4 + cymbal1 2 + cymbal1 2 + cymbal3 4 + cymbal1 2 + cymbal1 2 rest 2 rest 10 rest 8 - dnote 8, cymbal3 + cymbal3 8 loopchannel 0, Music_CinnabarMansion_branch_7edb5 -; 0x7edda
\ No newline at end of file +; 0x7edda diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index f7b9cc81..82754e0e 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -1,270 +1,270 @@ Music_Cities1_branch_aa6f:: - tempo 0, 232 + tempo 232 loopchannel 0, Music_Cities1_branch_aa79 Music_Cities1_Ch1:: ; aa76 (2:6a76) - tempo 0, 144 + tempo 144 Music_Cities1_branch_aa79:: - stereopanning 119 + volume 7, 7 vibrato 8, 2, 4 duty 3 Music_Cities1_branch_aa80:: notetype 12, 12, 5 octave 3 - note G#, 4 - note F#, 4 - note E_, 2 - note E_, 2 - note F#, 2 - note D#, 2 - note E_, 2 - note E_, 2 - note D#, 2 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 4 - note C#, 2 - note E_, 2 - note E_, 4 + G# 4 + F# 4 + E_ 2 + E_ 2 + F# 2 + D# 2 + E_ 2 + E_ 2 + D# 2 + C# 4 + D# 4 + E_ 2 + D# 4 + C# 2 + E_ 2 + E_ 4 notetype 12, 10, 5 - note C#, 4 + C# 4 octave 2 - note B_, 6 + B_ 6 octave 3 - note C#, 2 - note C#, 4 + C# 2 + C# 4 octave 2 - note B_, 4 + B_ 4 notetype 12, 12, 5 callchannel Music_Cities1_branch_ab7d octave 3 - note D#, 6 - note E_, 2 + D# 6 + E_ 2 octave 2 - note B_, 4 + B_ 4 notetype 12, 10, 5 octave 3 - note C#, 2 + C# 2 octave 2 - note B_, 2 - note A_, 4 - note B_, 4 - note B_, 2 + B_ 2 + A_ 4 + B_ 4 + B_ 2 octave 3 - note C#, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 2 + C# 2 + D# 2 + E_ 2 + D# 2 + C# 2 + D# 2 notetype 12, 12, 5 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 4 - note F#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note E_, 2 - note E_, 4 + G# 2 + E_ 2 + F# 2 + E_ 2 + E_ 4 + F# 2 + D# 2 + E_ 4 + D# 2 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + C# 2 + E_ 2 + E_ 4 notetype 12, 10, 5 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note B_, 6 + A_ 2 + B_ 6 octave 3 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 2 - note B_, 2 - note B_, 4 + B_ 2 + B_ 4 notetype 12, 12, 5 callchannel Music_Cities1_branch_ab7d octave 3 - note D#, 4 - note D#, 2 - note E_, 2 + D# 4 + D# 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note G#, 2 - note E_, 4 + C# 2 + G# 2 + E_ 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 notetype 12, 10, 5 - note C#, 4 + C# 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 4 - note C#, 2 - note E_, 4 + D# 4 + C# 2 + E_ 4 notetype 12, 11, 3 callchannel Music_Cities1_branch_ab8a - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note F#, 4 - note G#, 2 - note E_, 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + A_ 4 + F# 4 + G# 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 4 - note G#, 2 + E_ 4 + G# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + E_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + D# 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 Music_Cities1_branch_ab12:: - note C#, 2 - note D#, 2 - note C#, 2 + C# 2 + D# 2 + C# 2 octave 2 - note B_, 4 - note B_, 2 + B_ 4 + B_ 2 octave 3 - note C#, 2 - note D#, 2 + C# 2 + D# 2 loopchannel 2, Music_Cities1_branch_ab12 - note E_, 2 + E_ 2 octave 2 - note B_, 4 + B_ 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note G#, 2 - note G#, 2 + C# 2 + G# 2 + G# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 callchannel Music_Cities1_branch_ab8a - note A_, 2 - note E_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note F#, 2 - note G#, 2 - note E_, 2 + A_ 2 + E_ 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + F# 2 + G# 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note D#, 2 - note B_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 4 - note G#, 2 - note F#, 2 - note D#, 2 + E_ 2 + C# 2 + G# 2 + C# 2 + D# 2 + B_ 2 + E_ 2 + G# 2 + E_ 2 + F# 2 + E_ 4 + G# 2 + F# 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 4 - note F#, 2 - note D#, 2 - note D#, 2 - note F#, 2 + D# 4 + F# 2 + D# 2 + D# 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D#, 2 + D# 2 notetype 12, 11, 6 - note F#, 8 - note F#, 4 - note D#, 4 - note E_, 8 + F# 8 + F# 4 + D# 4 + E_ 8 notetype 12, 8, 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note E_, 2 - note F#, 2 + E_ 2 + F# 2 loopchannel 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 - note F#, 2 - note D#, 4 - note E_, 2 - note D#, 4 - note C#, 4 + F# 2 + D# 4 + E_ 2 + D# 4 + C# 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note C#, 2 - note D#, 2 - note C#, 2 + C# 2 + D# 2 + C# 2 endchannel Music_Cities1_branch_ab8a:: - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 4 - note A_, 2 - note C#, 2 - note E_, 2 + A_ 2 + E_ 2 + C# 2 + E_ 4 + A_ 2 + C# 2 + E_ 2 endchannel @@ -272,138 +272,138 @@ Music_Cities1_Ch2:: ; ab92 (2:6b92) vibrato 5, 1, 5 callchannel Music_Cities1_branch_ac00 octave 4 - note G#, 2 + G# 2 notetype 12, 12, 4 - note E_, 6 + E_ 6 notetype 12, 12, 5 duty 3 octave 3 - note C#, 4 - note D#, 4 - note E_, 6 - note F#, 6 - note G#, 4 + C# 4 + D# 4 + E_ 6 + F# 6 + G# 4 callchannel Music_Cities1_branch_ac00 octave 4 - note G#, 2 + G# 2 notetype 12, 12, 4 - note E_, 14 + E_ 14 duty 3 octave 3 - note E_, 6 - note F#, 6 - note G#, 4 + E_ 6 + F# 6 + G# 4 notetype 12, 11, 7 duty 2 vibrato 8, 1, 7 octave 5 - note C#, 12 + C# 12 octave 4 - note A_, 4 + A_ 4 octave 5 - note E_, 8 - note F#, 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 8 + F# 2 + E_ 2 + D# 2 + C# 2 octave 4 - note B_, 12 - note G#, 4 - note B_, 16 - note F#, 12 - note G#, 2 - note A_, 2 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note G#, 12 - note E_, 4 - note B_, 16 + B_ 12 + G# 4 + B_ 16 + F# 12 + G# 2 + A_ 2 + B_ 4 + A_ 4 + G# 4 + F# 4 + G# 12 + E_ 4 + B_ 16 octave 5 - note C#, 12 - note D#, 2 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 4 - note C#, 4 + C# 12 + D# 2 + E_ 2 + F# 4 + E_ 4 + D# 4 + C# 4 octave 4 - note B_, 12 + B_ 12 octave 5 - note C#, 2 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + C# 4 octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note A_, 12 - note B_, 2 + B_ 4 + A_ 4 + G# 4 + A_ 12 + B_ 2 octave 5 - note C_, 2 - note C_, 4 + C_ 2 + C_ 4 octave 4 - note B_, 4 - note A_, 4 - note F#, 4 + B_ 4 + A_ 4 + F# 4 notetype 12, 11, 7 - note A_, 8 + A_ 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note B_, 14 + B_ 14 notetype 12, 8, 4 - note G#, 1 + G# 1 notetype 12, 10, 4 - note A_, 1 + A_ 1 loopchannel 0, Music_Cities1_Ch2 Music_Cities1_branch_ac00:: duty 2 notetype 12, 12, 3 octave 4 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 notetype 12, 12, 4 - note G#, 10 + G# 10 notetype 12, 12, 3 - note G#, 2 - note A_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 + G# 2 + A_ 2 + B_ 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 notetype 12, 12, 4 - note F#, 10 + F# 10 notetype 12, 12, 5 duty 3 octave 3 - note E_, 4 - note D#, 8 - note E_, 4 - note F#, 4 + E_ 4 + D# 8 + E_ 4 + F# 4 notetype 12, 12, 3 duty 2 octave 4 - note A_, 4 - note G#, 4 + A_ 4 + G# 4 notetype 12, 12, 4 - note F#, 10 + F# 10 notetype 12, 12, 3 - note F#, 2 - note G#, 2 - note A_, 4 - note A_, 2 - note G#, 2 - note F#, 2 + F# 2 + G# 2 + A_ 4 + A_ 2 + G# 2 + F# 2 endchannel Music_Cities1_Ch3:: ; ac32 (2:6c32) notetype 12, 1, 1 - togglecall + toggleperfectpitch Music_Cities1_branch_ac35:: vibrato 0, 0, 0 @@ -411,171 +411,171 @@ Music_Cities1_branch_ac35:: callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acce - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 callchannel Music_Cities1_branch_acc5 - note B_, 2 - note E_, 2 - note F#, 2 - note G#, 2 + B_ 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acce - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + E_ 2 + F# 2 + G# 2 rest 2 - note G#, 2 - note E_, 2 - note B_, 2 + G# 2 + E_ 2 + B_ 2 rest 2 - note E_, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note E_, 2 + E_ 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + B_ 2 + E_ 2 vibrato 8, 2, 5 - note A_, 8 - note E_, 8 - note A_, 8 - note F#, 8 - note G#, 8 - note E_, 8 - note G#, 12 - note E_, 4 - note F#, 2 - note F#, 2 - note D#, 2 - note E_, 4 - note F#, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 + A_ 8 + E_ 8 + A_ 8 + F# 8 + G# 8 + E_ 8 + G# 12 + E_ 4 + F# 2 + F# 2 + D# 2 + E_ 4 + F# 2 + D# 2 + E_ 2 + F# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 2 + F# 2 + G# 2 + G# 2 + E_ 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 8 - note E_, 8 - note A_, 8 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 8 - note E_, 8 - note B_, 4 - note E_, 4 - note F#, 4 - note G#, 4 + E_ 2 + F# 2 + G# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + A_ 8 + E_ 8 + A_ 8 + B_ 2 + A_ 2 + G# 2 + F# 2 + G# 8 + E_ 8 + B_ 4 + E_ 4 + F# 4 + G# 4 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 rest 2 - note F#, 2 - note B_, 2 - note A_, 2 - note A_, 4 - note G#, 4 - note F#, 2 - note D#, 2 - note A_, 2 - note F#, 2 + F# 2 + B_ 2 + A_ 2 + A_ 4 + G# 4 + F# 2 + D# 2 + A_ 2 + F# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 1 - note G#, 1 - note E_, 1 - note F#, 1 - note G#, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 + E_ 2 + F# 1 + G# 1 + E_ 1 + F# 1 + G# 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 2 + F# 2 loopchannel 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 rest 2 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 endchannel Music_Cities1_branch_acce:: - note A_, 2 - note F#, 2 - note G#, 2 - note A_, 2 + A_ 2 + F# 2 + G# 2 + A_ 2 rest 2 - note A_, 2 - note G#, 2 - note F#, 2 + A_ 2 + G# 2 + F# 2 rest 2 - note F#, 2 - note G#, 2 - note A_, 2 + F# 2 + G# 2 + A_ 2 rest 2 - note A_, 2 - note G#, 2 - note F#, 2 - note D#, 2 - note D#, 2 - note E_, 2 - note F#, 2 + A_ 2 + G# 2 + F# 2 + D# 2 + D# 2 + E_ 2 + F# 2 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 rest 2 - note D#, 2 - note E_, 2 - note F#, 2 + D# 2 + E_ 2 + F# 2 endchannel @@ -591,68 +591,68 @@ Music_Cities1_branch_acf3:: callchannel Music_Cities1_branch_ad36 callchannel Music_Cities1_branch_ad5f callchannel Music_Cities1_branch_ad52 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 + triangle1 6 + triangle1 6 + triangle2 4 callchannel Music_Cities1_branch_ad6e callchannel Music_Cities1_branch_ad5f callchannel Music_Cities1_branch_ad52 callchannel Music_Cities1_branch_ad6e callchannel Music_Cities1_branch_ad52 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 2, triangle2 - dnote 2, triangle1 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle1 - dnote 6, triangle1 - dnote 6, snare6 - dnote 4, snare6 + triangle1 6 + triangle1 6 + triangle2 2 + triangle1 2 + triangle1 6 + triangle1 6 + triangle1 4 + triangle1 6 + snare6 6 + snare6 4 loopchannel 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - dnote 6, snare6 - dnote 6, snare6 - dnote 4, snare6 - dnote 6, snare6 - dnote 6, snare6 - dnote 2, snare6 - dnote 2, snare6 + snare6 6 + snare6 6 + snare6 4 + snare6 6 + snare6 6 + snare6 2 + snare6 2 endchannel Music_Cities1_branch_ad45:: - dnote 6, snare6 - dnote 6, snare6 - dnote 4, snare6 - dnote 6, snare6 - dnote 6, snare6 - dnote 4, snare6 + snare6 6 + snare6 6 + snare6 4 + snare6 6 + snare6 6 + snare6 4 endchannel Music_Cities1_branch_ad52:: - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 + triangle1 6 + triangle1 6 + triangle2 4 + triangle1 6 + triangle1 6 + triangle2 4 endchannel Music_Cities1_branch_ad5f:: - dnote 6, triangle1 - dnote 6, triangle1 - dnote 4, triangle2 - dnote 6, triangle1 - dnote 6, triangle1 - dnote 2, triangle2 - dnote 2, triangle1 + triangle1 6 + triangle1 6 + triangle2 4 + triangle1 6 + triangle1 6 + triangle2 2 + triangle1 2 endchannel Music_Cities1_branch_ad6e:: - dnote 6, triangle1 - dnote 6, triangle1 - dnote 2, triangle2 - dnote 2, triangle2 + triangle1 6 + triangle1 6 + triangle2 2 + triangle2 2 endchannel -; 0xad77
\ No newline at end of file +; 0xad77 diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 97eadde8..34297e68 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,95 +1,95 @@ Music_Cities2_Ch1:: ; b504 (2:7504) - tempo 0, 148 - stereopanning 119 + tempo 148 + volume 7, 7 duty 3 vibrato 8, 3, 2 - togglecall + toggleperfectpitch notetype 12, 11, 6 rest 8 octave 3 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 + E_ 2 + D# 2 + C# 2 + C_ 2 octave 2 - note B_, 2 + B_ 2 rest 14 Music_Cities2_branch_b51a:: octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 - note D#, 1 - note D_, 1 - note C#, 4 + C# 2 + D# 1 + D_ 1 + C# 4 octave 3 - note B_, 4 - note G#, 8 - note E_, 8 - note A_, 4 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + B_ 4 + G# 8 + E_ 8 + A_ 4 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 + C# 2 rest 16 - note C#, 4 + C# 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 1 - note D#, 1 - note C#, 4 + C# 1 + D# 1 + C# 4 octave 3 - note B_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 3 - note G#, 8 - note B_, 4 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note E_, 2 - note F#, 2 - note G#, 2 + G# 8 + B_ 4 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 + E_ 2 + F# 2 + G# 2 rest 2 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 4 - note F#, 2 - note G#, 2 - note A_, 2 + B_ 4 + F# 2 + G# 2 + A_ 2 rest 2 octave 4 - note F#, 4 - note D#, 4 + F# 4 + D# 4 octave 3 - note E_, 2 + E_ 2 rest 4 - note F#, 2 + F# 2 rest 4 - note A_, 2 + A_ 2 rest 2 - note B_, 2 + B_ 2 rest 16 rest 16 rest 14 - note E_, 16 - note F#, 8 - note G#, 4 - note F#, 4 - note E_, 2 + E_ 16 + F# 8 + G# 4 + F# 4 + E_ 2 rest 14 loopchannel 0, Music_Cities2_branch_b51a @@ -99,184 +99,184 @@ Music_Cities2_Ch2:: ; b569 (2:7569) vibrato 8, 2, 3 notetype 12, 12, 2 octave 4 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 6 + C# 2 + D# 2 + E_ 6 notetype 12, 12, 2 duty 2 octave 4 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 Music_Cities2_branch_b58b:: notetype 12, 10, 6 - note G#, 6 + G# 6 notetype 12, 12, 2 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 notetype 12, 12, 4 - note F#, 14 + F# 14 notetype 12, 12, 2 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 4 - note G#, 6 + G# 6 notetype 12, 12, 2 - note E_, 1 - note G#, 1 + E_ 1 + G# 1 notetype 12, 12, 5 - note B_, 14 + B_ 14 notetype 12, 12, 2 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 10, 6 - note G#, 6 + G# 6 notetype 12, 12, 2 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 notetype 12, 12, 4 - note F#, 8 + F# 8 notetype 12, 10, 1 duty 1 octave 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 notetype 12, 12, 2 duty 2 octave 4 - note E_, 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 4 - note G#, 6 - note E_, 1 - note G#, 1 + G# 6 + E_ 1 + G# 1 notetype 12, 12, 6 - note B_, 8 + B_ 8 notetype 12, 12, 2 - note C#, 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D#, 1 - note E_, 4 + C# 1 + D# 1 + E_ 4 notetype 12, 12, 7 - note G#, 4 - note E_, 4 + G# 4 + E_ 4 notetype 12, 12, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - note F#, 4 + D# 1 + C# 1 + D# 1 + E_ 1 + F# 4 notetype 12, 12, 7 - note B_, 4 - note F#, 4 + B_ 4 + F# 4 notetype 12, 12, 2 - note C#, 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D#, 1 - note E_, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note G#, 2 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note B_, 1 - note F#, 1 - note D#, 1 - note C#, 1 + C# 1 + D# 1 + E_ 2 + E_ 1 + D# 1 + E_ 1 + F# 1 + G# 2 + G# 1 + A_ 1 + G# 1 + A_ 1 + B_ 1 + F# 1 + D# 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D#, 1 - note F#, 1 + C# 1 + D# 1 + F# 1 notetype 12, 12, 2 - note B_, 8 + B_ 8 notetype 12, 11, 7 octave 3 - note E_, 8 + E_ 8 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note G#, 4 - note A_, 4 - note B_, 8 - note B_, 8 - note G#, 4 + F# 4 + G# 4 + A_ 4 + B_ 8 + B_ 8 + G# 4 octave 4 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + D# 2 notetype 12, 12, 2 - note E_, 6 - note E_, 1 + E_ 6 + E_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + C# 2 + D# 2 + E_ 1 + F# 1 + G# 1 + A_ 1 loopchannel 0, Music_Cities2_branch_b58b @@ -284,134 +284,134 @@ Music_Cities2_Ch3:: ; b640 (2:7640) notetype 12, 1, 1 rest 16 octave 4 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 Music_Cities2_branch_b64c:: - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 rest 2 - note E_, 4 - note G#, 4 - note F#, 2 - note A_, 2 - note F#, 2 + E_ 4 + G# 4 + F# 2 + A_ 2 + F# 2 rest 2 - note F#, 4 - note A_, 4 - note C#, 2 + F# 4 + A_ 4 + C# 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note G#, 2 - note A_, 2 - note B_, 2 + G# 2 + A_ 2 + B_ 2 rest 8 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 loopchannel 0, Music_Cities2_branch_b64c -; 0xb6c7
\ No newline at end of file +; 0xb6c7 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index cdedef62..4c3fa487 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,286 +1,286 @@ Music_Credits_Ch1:: ; 7fc1f (1f:7c1f) - tempo 0, 140 - stereopanning 119 + tempo 140 + volume 7, 7 duty 3 vibrato 8, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 5 octave 4 - note E_, 6 + E_ 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note E_, 1 - note D_, 6 + E_ 1 + D_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note D_, 1 - note C#, 6 + D_ 1 + C# 6 octave 3 - note F#, 1 - octave 4 - note C#, 1 - note D_, 4 - note E_, 2 - note C#, 1 - note E_, 1 - note C#, 1 + F# 1 + octave 4 + C# 1 + D_ 4 + E_ 2 + C# 1 + E_ 1 + C# 1 rest 1 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 - note E_, 1 - note F#, 1 - note G_, 1 + E_ 1 + E_ 1 + F# 1 + G_ 1 notetype 12, 11, 6 - note A_, 4 - note E_, 2 - note A_, 2 - note G_, 4 - note A_, 2 - note G_, 2 - note B_, 4 - note A_, 4 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 6 - note E_, 2 - note A_, 4 - note C#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note A_, 4 - note E_, 2 - note A_, 2 - note G_, 4 - note A_, 2 - note G_, 2 - note B_, 4 - note A_, 4 - note G_, 2 - note A_, 2 - note F#, 2 - note D_, 2 - note E_, 6 - note C#, 2 - note A_, 4 - note C#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note G_, 4 - note D_, 2 - note G_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 6 - note A_, 2 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note G_, 4 - note D_, 2 - note G_, 2 - note B_, 2 - octave 4 - note C#, 2 + A_ 4 + E_ 2 + A_ 2 + G_ 4 + A_ 2 + G_ 2 + B_ 4 + A_ 4 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C# 6 + E_ 2 + A_ 4 + C# 4 + E_ 4 + D_ 2 + C# 2 + E_ 2 + F# 2 + G_ 2 + F# 2 + A_ 4 + E_ 2 + A_ 2 + G_ 4 + A_ 2 + G_ 2 + B_ 4 + A_ 4 + G_ 2 + A_ 2 + F# 2 + D_ 2 + E_ 6 + C# 2 + A_ 4 + C# 4 + E_ 4 + D_ 2 + C# 2 + E_ 2 + F# 2 + G_ 2 + F# 2 + G_ 4 + D_ 2 + G_ 2 + B_ 2 + A_ 2 + G_ 2 + A_ 2 + D_ 4 + E_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 6 + A_ 2 + G_ 4 + F# 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 + G_ 4 + D_ 2 + G_ 2 + B_ 2 + octave 4 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 + B_ 2 + A_ 2 + D_ 4 + E_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 notetype 12, 11, 7 - note E_, 6 - note A_, 2 - note G_, 4 - note F#, 4 + E_ 6 + A_ 2 + G_ 4 + F# 4 notetype 12, 12, 7 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 - note D_, 4 + C# 4 + D_ 4 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 notetype 12, 9, 0 - note G_, 8 - note F#, 8 - note E_, 8 - note D_, 8 + G_ 8 + F# 8 + E_ 8 + D_ 8 rest 16 rest 16 rest 8 notetype 12, 11, 6 - note E_, 6 - note D#, 1 - note D_, 1 + E_ 6 + D# 1 + D_ 1 notetype 12, 10, 0 - note C#, 8 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 rest 16 rest 16 rest 8 - note E_, 6 - note C#, 1 - note E_, 1 + E_ 6 + C# 1 + E_ 1 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 10, 7 - note A_, 8 + A_ 8 notetype 12, 11, 6 - note G_, 6 - note D_, 4 - note G_, 2 - note B_, 4 + G_ 6 + D_ 4 + G_ 2 + B_ 4 notetype 12, 11, 7 - note G_, 8 - note F#, 4 - note G#, 4 + G_ 8 + F# 4 + G# 4 notetype 12, 9, 0 - note A_, 8 - note F#, 8 - note E_, 8 - note C#, 8 + A_ 8 + F# 8 + E_ 8 + C# 8 notetype 12, 11, 7 - note D_, 8 - note C#, 8 + D_ 8 + C# 8 octave 2 - note B_, 8 + B_ 8 octave 3 - note D_, 8 + D_ 8 notetype 12, 9, 0 - note E_, 8 - note D_, 8 - note F#, 8 - note E_, 8 + E_ 8 + D_ 8 + F# 8 + E_ 8 notetype 12, 10, 0 - note D_, 8 - note E_, 8 - note D_, 8 - note C_, 8 - note G_, 8 - note F_, 8 - note E_, 8 - note D_, 8 + D_ 8 + E_ 8 + D_ 8 + C_ 8 + G_ 8 + F_ 8 + E_ 8 + D_ 8 notetype 12, 10, 0 - note C#, 6 + C# 6 notetype 12, 10, 7 - note C#, 6 + C# 6 notetype 12, 11, 7 - note D_, 4 - note E_, 8 - note G_, 6 - note F#, 1 - note F_, 1 + D_ 4 + E_ 8 + G_ 6 + F# 1 + F_ 1 notetype 12, 10, 0 - note E_, 6 + E_ 6 notetype 12, 10, 7 - note E_, 6 + E_ 6 notetype 12, 11, 7 - note D_, 4 + D_ 4 notetype 12, 10, 0 - note C#, 8 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 notetype 12, 11, 7 - note E_, 6 - note D_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 4 - note D_, 4 - note C#, 4 - note C#, 4 - note E_, 4 - note F#, 4 + E_ 6 + D_ 2 + G_ 4 + F# 4 + E_ 4 + F# 4 + E_ 4 + D_ 4 + E_ 4 + D_ 4 + C# 4 + D_ 4 + C# 4 + C# 4 + E_ 4 + F# 4 notetype 12, 10, 0 - note E_, 6 + E_ 6 notetype 12, 11, 7 - note D_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note F#, 4 - note A_, 4 - note B_, 4 + D_ 2 + G_ 4 + F# 4 + E_ 4 + F# 4 + A_ 4 + B_ 4 notetype 12, 10, 0 octave 4 - note C#, 16 - note C#, 8 + C# 16 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 notetype 12, 11, 5 octave 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 - note A_, 1 + A_ 1 + A_ 1 notetype 12, 11, 1 - note A_, 8 + A_ 8 endchannel @@ -289,326 +289,326 @@ Music_Credits_Ch2:: ; 7fd5f (1f:7d5f) vibrato 10, 2, 5 notetype 12, 12, 5 octave 4 - note A_, 6 - note E_, 1 - note A_, 1 - note G_, 6 - note D_, 1 - note G_, 1 + A_ 6 + E_ 1 + A_ 1 + G_ 6 + D_ 1 + G_ 1 notetype 12, 12, 7 - note F#, 12 - note G#, 2 - note E_, 1 - note G#, 1 + F# 12 + G# 2 + E_ 1 + G# 1 notetype 12, 12, 2 - note A_, 2 + A_ 2 notetype 12, 12, 1 octave 3 - note A_, 4 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note A_, 4 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 + A_ 4 + A_ 1 + A_ 1 + A_ 2 + A_ 2 + A_ 4 + A_ 2 + A_ 4 + A_ 1 + A_ 1 + A_ 2 + A_ 2 notetype 12, 12, 4 - note A_, 1 - note F#, 1 - note A_, 1 - note B_, 1 + A_ 1 + F# 1 + A_ 1 + B_ 1 notetype 12, 12, 7 octave 4 - note C#, 6 - note C#, 1 - note D_, 1 - note E_, 4 - note C#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 6 + C# 6 + C# 1 + D_ 1 + E_ 4 + C# 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 + C# 6 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 8 + E_ 8 octave 3 - note A_, 6 - note E_, 2 - octave 4 - note C#, 8 - note C#, 6 - note C#, 1 - note D_, 1 - note E_, 4 - note C#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 6 + A_ 6 + E_ 2 + octave 4 + C# 8 + C# 6 + C# 1 + D_ 1 + E_ 4 + C# 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 + C# 6 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 8 + E_ 8 octave 3 - note A_, 6 - note E_, 2 + A_ 6 + E_ 2 notetype 12, 11, 0 octave 4 - note C#, 8 + C# 8 notetype 12, 12, 7 - note D_, 6 + D_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 8 + G_ 8 octave 3 - note G_, 6 - note D_, 2 - note B_, 8 + G_ 6 + D_ 2 + B_ 8 notetype 12, 11, 0 octave 4 - note C#, 6 + C# 6 notetype 12, 11, 7 - note C#, 6 - note D_, 4 + C# 6 + D_ 4 notetype 12, 10, 0 - note E_, 8 + E_ 8 notetype 12, 10, 7 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note D_, 6 + D_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 8 + G_ 8 octave 3 - note G_, 6 - note D_, 2 - note B_, 8 + G_ 6 + D_ 2 + B_ 8 notetype 12, 11, 0 octave 4 - note E_, 7 + E_ 7 notetype 12, 11, 7 - note E_, 7 + E_ 7 notetype 12, 12, 3 - note E_, 1 - note G#, 1 + E_ 1 + G# 1 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 12, 6 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 + G_ 4 + F# 4 + E_ 4 + D_ 4 notetype 12, 10, 0 - note C#, 8 + C# 8 notetype 12, 10, 7 - note C#, 8 + C# 8 notetype 12, 9, 0 octave 3 - note A_, 8 + A_ 8 notetype 12, 9, 7 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note D_, 8 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 + D_ 8 + G_ 6 + F# 1 + F_ 1 + E_ 8 notetype 12, 11, 7 - note G_, 6 - note F#, 1 - note F_, 1 + G_ 6 + F# 1 + F_ 1 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 notetype 12, 11, 0 - note D_, 8 + D_ 8 notetype 12, 11, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 2 - note B_, 8 + B_ 8 octave 3 - note F#, 6 - note D_, 1 - note F#, 1 - note E_, 8 - note B_, 6 - note G_, 1 - note B_, 1 + F# 6 + D_ 1 + F# 1 + E_ 8 + B_ 6 + G_ 1 + B_ 1 notetype 12, 11, 0 octave 4 - note C#, 8 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 notetype 12, 11, 0 - note D_, 8 + D_ 8 notetype 12, 11, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 3 - note B_, 8 + B_ 8 octave 4 - note D_, 6 + D_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note D_, 1 + D_ 1 notetype 12, 11, 0 - note C#, 6 + C# 6 notetype 12, 11, 7 - note C#, 6 + C# 6 notetype 12, 12, 7 octave 3 - note B_, 4 + B_ 4 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note F#, 6 + F# 6 notetype 12, 11, 7 - note F#, 6 + F# 6 notetype 12, 12, 7 - note G#, 4 - note A_, 8 - note F#, 8 + G# 4 + A_ 8 + F# 8 notetype 12, 11, 0 - note G#, 6 + G# 6 notetype 12, 11, 7 - note G#, 6 + G# 6 notetype 12, 12, 7 - note A_, 4 - note B_, 8 - note G#, 8 + A_ 4 + B_ 8 + G# 8 notetype 12, 11, 0 - note A_, 6 + A_ 6 notetype 12, 11, 7 - note A_, 6 + A_ 6 notetype 12, 12, 7 - note B_, 4 + B_ 4 octave 4 - note C_, 8 + C_ 8 octave 3 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note B_, 6 + B_ 6 notetype 12, 11, 7 - note B_, 6 + B_ 6 notetype 12, 12, 7 octave 4 - note C_, 4 + C_ 4 notetype 12, 11, 0 - note D_, 8 + D_ 8 octave 3 - note B_, 8 + B_ 8 notetype 12, 11, 0 octave 4 - note C#, 16 - note C#, 8 + C# 16 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 notetype 12, 11, 0 octave 3 - note A_, 16 - note A_, 8 + A_ 16 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note G_, 6 - note B_, 2 + G_ 6 + B_ 2 octave 4 - note D_, 8 + D_ 8 octave 3 - note B_, 6 + B_ 6 octave 4 - note D_, 2 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 + D_ 2 + G_ 6 + F# 1 + F_ 1 + E_ 8 octave 3 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 - note C#, 4 - note D_, 4 - note G_, 6 - note B_, 2 - octave 4 - note D_, 8 + G_ 6 + F# 1 + F_ 1 + E_ 8 + C# 4 + D_ 4 + G_ 6 + B_ 2 + octave 4 + D_ 8 octave 3 - note B_, 6 + B_ 6 octave 4 - note D_, 2 - note G_, 8 + D_ 2 + G_ 8 notetype 12, 11, 0 - note A_, 16 + A_ 16 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 10, 7 - note A_, 8 + A_ 8 notetype 12, 12, 1 - note A_, 2 - note A_, 4 - note A_, 1 - note A_, 1 + A_ 2 + A_ 4 + A_ 1 + A_ 1 notetype 12, 12, 1 - note A_, 8 + A_ 8 endchannel Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) notetype 12, 1, 0 octave 5 - note C#, 6 + C# 6 octave 4 - note A_, 1 + A_ 1 octave 5 - note C#, 1 - note D_, 6 + C# 1 + D_ 6 octave 4 - note B_, 1 + B_ 1 octave 5 - note D_, 1 - note F#, 6 - note D_, 1 - note F#, 1 - note A_, 4 - note G#, 2 - note E_, 1 - note G#, 1 - note A_, 1 + D_ 1 + F# 6 + D_ 1 + F# 1 + A_ 4 + G# 2 + E_ 1 + G# 1 + A_ 1 rest 15 rest 16 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 octave 4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 @@ -617,30 +617,30 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffc1 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffc1 callchannel Music_Credits_branch_7ffc1 octave 4 - note G_, 4 - note A_, 4 - note B_, 4 + G_ 4 + A_ 4 + B_ 4 octave 5 - note D_, 4 + D_ 4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffa4 @@ -650,53 +650,53 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 - note E_, 4 - note A_, 2 - note E_, 4 - note A_, 2 - note E_, 2 - note A_, 2 + E_ 4 + A_ 2 + E_ 4 + A_ 2 + E_ 2 + A_ 2 callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffae callchannel Music_Credits_branch_7ffa4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + G# 2 + A_ 2 callchannel Music_Credits_branch_7ffd2 callchannel Music_Credits_branch_7ffd2 callchannel Music_Credits_branch_7ffdb callchannel Music_Credits_branch_7ffdb - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 + A_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 2 + F_ 2 callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffb8 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 + E_ 4 + A_ 4 + E_ 4 + A_ 4 + E_ 4 + A_ 4 + E_ 4 + A_ 4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffa4 callchannel Music_Credits_branch_7ffe4 @@ -707,115 +707,115 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2) callchannel Music_Credits_branch_7ffb8 callchannel Music_Credits_branch_7ffed callchannel Music_Credits_branch_7ffed - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 - note A_, 1 - note A_, 1 + A_ 1 + A_ 1 + A_ 1 rest 7 endchannel Music_Credits_branch_7ffa4:: octave 4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 endchannel Music_Credits_branch_7ffae:: octave 4 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 endchannel Music_Credits_branch_7ffb8:: - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 endchannel Music_Credits_branch_7ffc1:: octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 endchannel Music_Credits_branch_7ffd2:: - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 endchannel Music_Credits_branch_7ffdb:: - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 endchannel Music_Credits_branch_7ffe4:: - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 endchannel Music_Credits_branch_7ffed:: - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 - note A_, 1 - note A_, 1 + A_ 1 + A_ 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 endchannel -; 0x7fffa
\ No newline at end of file +; 0x7fffa diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 0e24d904..96c2b9fc 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,164 +1,164 @@ Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 duty 3 vibrato 18, 3, 1 - togglecall - tempo 0, 112 + toggleperfectpitch + tempo 112 notetype 12, 10, 6 octave 4 - note D_, 6 + D_ 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note D_, 1 - note F#, 6 - note D_, 1 - note F#, 1 + D_ 1 + F# 6 + D_ 1 + F# 1 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 10, 7 - note A_, 8 + A_ 8 Music_DefeatedGymLeader_branch_23ccc:: notetype 12, 11, 2 octave 3 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 4 - note D_, 4 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 2 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + E_ 2 + D_ 4 + D_ 4 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + C# 2 notetype 12, 11, 1 octave 2 - note B_, 8 + B_ 8 notetype 12, 11, 2 octave 3 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 4 - note D_, 4 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 2 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + E_ 2 + D_ 4 + D_ 4 + A_ 2 + A_ 2 + F# 4 + G_ 2 + G_ 2 + E_ 4 + D_ 2 + E_ 2 + D_ 2 + C# 2 notetype 12, 11, 1 octave 2 - note B_, 8 + B_ 8 notetype 12, 9, 7 octave 3 - note D_, 6 + D_ 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note D_, 1 - note F#, 8 + D_ 1 + F# 8 notetype 12, 11, 0 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 + F# 6 + E_ 1 + F# 1 + A_ 8 notetype 12, 9, 7 - note E_, 6 - note C#, 1 - note E_, 1 - note G#, 8 + E_ 6 + C# 1 + E_ 1 + G# 8 notetype 12, 11, 0 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 + G# 6 + E_ 1 + G# 1 + B_ 8 notetype 12, 9, 7 - note C#, 6 + C# 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note C#, 1 - note E_, 8 + C# 1 + E_ 8 notetype 12, 11, 0 - note E_, 6 - note C#, 1 - note E_, 1 - note E_, 4 - note G_, 4 + E_ 6 + C# 1 + E_ 1 + E_ 4 + G_ 4 notetype 12, 9, 0 - note F#, 8 - note E_, 8 - note D_, 8 - note C#, 8 + F# 8 + E_ 8 + D_ 8 + C# 8 notetype 12, 9, 7 - note D_, 6 + D_ 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note D_, 1 - note F#, 8 + D_ 1 + F# 8 notetype 12, 11, 0 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 + F# 6 + E_ 1 + F# 1 + A_ 8 notetype 12, 9, 7 - note E_, 6 - note C#, 1 - note E_, 1 - note G#, 8 + E_ 6 + C# 1 + E_ 1 + G# 8 notetype 12, 11, 0 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 + G# 6 + E_ 1 + G# 1 + B_ 8 notetype 12, 9, 7 - note C#, 6 + C# 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note C#, 1 - note E_, 8 + C# 1 + E_ 8 notetype 12, 11, 0 - note E_, 6 - note C#, 1 - note E_, 1 - note E_, 4 - note G_, 4 + E_ 6 + C# 1 + E_ 1 + E_ 4 + G_ 4 notetype 12, 9, 7 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 + F# 6 + E_ 1 + F# 1 + A_ 8 notetype 12, 10, 7 - note G_, 8 - note E_, 8 + G_ 8 + E_ 8 loopchannel 0, Music_DefeatedGymLeader_branch_23ccc @@ -167,188 +167,188 @@ Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d) vibrato 24, 2, 4 notetype 12, 12, 4 octave 4 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 octave 5 - note D_, 6 + D_ 6 octave 4 - note A_, 1 + A_ 1 octave 5 - note D_, 1 + D_ 1 notetype 12, 11, 0 - note F#, 8 + F# 8 notetype 12, 11, 7 - note F#, 8 + F# 8 Music_DefeatedGymLeader_branch_23d84:: notetype 12, 12, 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 4 - note A_, 4 - note A_, 4 + A_ 4 + A_ 4 notetype 12, 12, 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 1 - note D_, 6 + D_ 6 notetype 6, 12, 2 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 4 - note C#, 1 + C# 1 notetype 12, 12, 2 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 4 - note A_, 4 - note A_, 3 + A_ 4 + A_ 3 notetype 6, 12, 2 - note B_, 1 + B_ 1 octave 4 - note C#, 1 + C# 1 notetype 12, 12, 2 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 + B_ 2 + A_ 4 + B_ 2 + A_ 2 + G_ 2 + F# 2 notetype 12, 12, 1 - note D_, 8 + D_ 8 notetype 12, 12, 7 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 notetype 12, 11, 0 octave 4 - note D_, 8 + D_ 8 notetype 12, 10, 0 - note D_, 8 + D_ 8 notetype 12, 9, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 notetype 12, 8, 0 octave 4 - note E_, 8 + E_ 8 notetype 12, 10, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 + E_ 8 octave 3 - note G_, 6 - note E_, 1 - note G_, 1 + G_ 6 + E_ 1 + G_ 1 notetype 12, 6, 15 octave 4 - note C#, 8 + C# 8 notetype 12, 12, 7 - note C#, 8 - note F#, 4 - note E_, 4 + C# 8 + F# 4 + E_ 4 notetype 12, 11, 0 - note D_, 14 + D_ 14 octave 3 - note B_, 2 + B_ 2 notetype 12, 10, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 notetype 12, 11, 0 octave 4 - note D_, 8 + D_ 8 notetype 12, 10, 0 - note D_, 8 + D_ 8 notetype 12, 9, 7 - note D_, 8 + D_ 8 notetype 12, 12, 7 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 notetype 12, 4, 15 octave 4 - note E_, 8 + E_ 8 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 + E_ 8 octave 3 - note G_, 6 - note E_, 1 - note G_, 1 + G_ 6 + E_ 1 + G_ 1 notetype 12, 11, 0 octave 4 - note C#, 8 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 octave 3 - note A_, 4 + A_ 4 octave 4 - note C#, 4 + C# 4 notetype 12, 11, 0 - note D_, 14 - note E_, 2 - note D_, 12 + D_ 14 + E_ 2 + D_ 12 notetype 12, 12, 2 octave 3 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 4 - note C#, 1 + C# 1 loopchannel 0, Music_DefeatedGymLeader_branch_23d84 @@ -356,253 +356,253 @@ Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52) notetype 12, 1, 0 vibrato 16, 1, 2 octave 4 - note F#, 6 - note D_, 1 - note F#, 1 - note A_, 6 - note F#, 1 - note A_, 1 + F# 6 + D_ 1 + F# 1 + A_ 6 + F# 1 + A_ 1 octave 5 - note D_, 6 + D_ 6 octave 4 - note A_, 1 + A_ 1 octave 5 - note D_, 1 - note F#, 8 + D_ 1 + F# 8 Music_DefeatedGymLeader_branch_23e65:: octave 4 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F#, 3 + F# 3 rest 1 - note F#, 3 + F# 3 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 5 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 3 + G_ 3 rest 1 - note D_, 3 + D_ 3 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 7 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note E_, 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + C# 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + G_ 2 + A_ 2 + G_ 2 + E_ 2 loopchannel 0, Music_DefeatedGymLeader_branch_23e65 -; 0x23f52
\ No newline at end of file +; 0x23f52 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 5585066a..624190f6 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,97 +1,97 @@ Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53) - tempo 0, 224 - stereopanning 119 + tempo 224 + volume 7, 7 duty 2 - togglecall - tempo 0, 224 + toggleperfectpitch + tempo 224 notetype 4, 10, 2 octave 4 - note D_, 2 - tempo 0, 224 + D_ 2 + tempo 224 notetype 4, 10, 2 - note D_, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 + D_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 notetype 4, 11, 3 - note F#, 12 + F# 12 duty 1 - tempo 0, 224 + tempo 224 Music_DefeatedTrainer_branch_23a76:: notetype 4, 6, 3 octave 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 + A_ 6 + F# 3 + A_ 3 + B_ 6 + G# 3 + B_ 3 octave 4 - note C#, 3 + C# 3 octave 3 - note B_, 3 - note A_, 3 - note G_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note G_, 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 + B_ 3 + A_ 3 + G_ 3 + A_ 3 + B_ 3 + A_ 3 + G_ 3 + A_ 6 + F# 3 + A_ 3 + B_ 6 + G# 3 + B_ 3 octave 4 - note C#, 3 - note D_, 3 - note E_, 3 - note F#, 3 - note C#, 3 + C# 3 + D_ 3 + E_ 3 + F# 3 + C# 3 octave 3 - note B_, 3 - note A_, 3 + B_ 3 + A_ 3 octave 4 - note C#, 3 + C# 3 octave 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 + A_ 6 + F# 3 + A_ 3 + B_ 6 + G# 3 + B_ 3 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note C_, 3 - note D_, 3 + C_ 3 + D_ 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note D_, 6 - note C#, 3 + D_ 6 + C# 3 octave 3 - note B_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note G_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + G_ 3 + F# 3 + G_ 3 + A_ 3 + B_ 3 + A_ 3 + G_ 3 + F# 3 + E_ 3 + F# 3 + G_ 3 + A_ 3 + B_ 3 loopchannel 0, Music_DefeatedTrainer_branch_23a76 @@ -99,169 +99,169 @@ Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1) duty 2 notetype 4, 12, 3 octave 4 - note A_, 2 + A_ 2 notetype 4, 12, 3 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 2 + A_ 2 + A_ 2 + A_ 2 + B_ 2 octave 5 - note C#, 2 + C# 2 notetype 4, 12, 4 - note D_, 12 + D_ 12 Music_DefeatedTrainer_branch_23ad2:: notetype 4, 8, 5 octave 4 - note D_, 6 + D_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note D_, 3 - note E_, 6 + D_ 3 + E_ 6 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 6 - note E_, 3 - note F#, 3 - note G_, 6 - note D_, 6 + E_ 3 + F# 3 + G_ 3 + A_ 6 + E_ 3 + F# 3 + G_ 6 + D_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note D_, 3 - note E_, 6 + D_ 3 + E_ 6 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 6 - note F#, 3 - note G_, 3 - note A_, 6 - note D_, 6 + E_ 3 + F# 3 + G_ 3 + A_ 6 + F# 3 + G_ 3 + A_ 6 + D_ 6 octave 3 - note A_, 3 + A_ 3 octave 4 - note D_, 3 - note E_, 6 + D_ 3 + E_ 6 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note F_, 6 - note C_, 3 - note F_, 3 - note G_, 3 - note D_, 3 - note G_, 6 + E_ 3 + F_ 6 + C_ 3 + F_ 3 + G_ 3 + D_ 3 + G_ 6 notetype 4, 7, 0 - note F#, 12 + F# 12 notetype 4, 7, 7 - note F#, 12 + F# 12 notetype 4, 6, 0 - note E_, 12 + E_ 12 notetype 4, 6, 7 - note E_, 12 + E_ 12 loopchannel 0, Music_DefeatedTrainer_branch_23ad2 Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15) notetype 4, 1, 0 octave 5 - note D_, 2 + D_ 2 notetype 4, 1, 0 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 12 + B_ 2 + A_ 2 + G_ 2 + A_ 12 notetype 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: - note F#, 3 + F# 3 rest 3 - note F#, 3 + F# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note B_, 3 + B_ 3 rest 3 - note B_, 3 + B_ 3 rest 3 - note F#, 3 + F# 3 rest 3 - note F#, 3 + F# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note G#, 3 + G# 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 octave 5 - note C#, 3 + C# 3 rest 3 - note C#, 3 + C# 3 octave 4 - note A_, 3 - note F#, 3 + A_ 3 + F# 3 octave 5 - note D_, 3 + D_ 3 octave 4 - note F#, 3 + F# 3 rest 3 - note G#, 3 + G# 3 octave 5 - note E_, 3 + E_ 3 octave 4 - note G#, 3 + G# 3 rest 3 - note A_, 3 + A_ 3 octave 5 - note F_, 3 + F_ 3 octave 4 - note A_, 3 + A_ 3 rest 3 - note B_, 3 + B_ 3 octave 5 - note G_, 3 + G_ 3 octave 4 - note B_, 3 - note A#, 3 - note A_, 3 + B_ 3 + A# 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 rest 3 - note A_, 3 + A_ 3 octave 5 - note C_, 3 - note C#, 3 + C_ 3 + C# 3 rest 3 - note C#, 3 + C# 3 rest 3 - note C#, 3 + C# 3 rest 3 - note C#, 3 + C# 3 octave 4 - note A_, 3 + A_ 3 loopchannel 0, Music_DefeatedTrainer_branch_23b24 -; 0x23b74
\ No newline at end of file +; 0x23b74 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index c56c6471..93b4d3ff 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,69 +1,69 @@ Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 executemusic duty 3 vibrato 6, 3, 4 - togglecall - tempo 0, 112 + toggleperfectpitch + tempo 112 notetype 12, 11, 7 octave 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 12 + B_ 1 + A_ 1 + G# 1 + F# 1 + E_ 12 Music_DefeatedWildMon_branch_23b8b:: notetype 12, 6, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 2 - note G#, 4 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 8 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 8 + E_ 2 + F# 2 + E_ 2 + F# 2 + G# 2 + G# 2 + G# 4 + A_ 2 + A_ 2 + A_ 4 + G# 2 + G# 2 + G# 4 + E_ 2 + F# 2 + E_ 2 + F# 2 + G# 2 + G# 2 + G# 4 + A_ 2 + A_ 2 + A_ 4 + G# 8 + F_ 2 + G_ 2 + F_ 2 + G_ 2 + A_ 2 + A_ 2 + A_ 4 + A# 2 + A# 2 + A# 4 + A_ 2 + A_ 2 + A_ 4 + F_ 2 + G_ 2 + F_ 2 + G_ 2 + A_ 2 + A_ 2 + A_ 4 + A# 2 + A# 2 + A# 4 + A_ 8 loopchannel 0, Music_DefeatedWildMon_branch_23b8b @@ -72,73 +72,73 @@ Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1) duty 2 notetype 12, 12, 3 octave 4 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 12, 12, 7 - note B_, 12 + B_ 12 Music_DefeatedWildMon_branch_23bce:: notetype 12, 8, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + B_ 2 + B_ 2 + B_ 4 octave 4 - note C#, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 2 + C# 4 octave 3 - note B_, 2 - note B_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 + B_ 2 + B_ 2 + B_ 4 + B_ 2 + A_ 2 + G# 2 + A_ 2 + B_ 2 + B_ 2 + B_ 4 octave 4 - note C#, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 2 + C# 4 octave 3 - note B_, 8 + B_ 8 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note A#, 2 + A# 2 + A_ 2 + A# 2 octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 2 - note C_, 2 - note C_, 4 - note C_, 2 + C_ 2 + C_ 2 + C_ 4 + D_ 2 + D_ 2 + D_ 4 + C_ 2 + C_ 2 + C_ 4 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note A#, 2 + A# 2 + A_ 2 + A# 2 octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 8 + C_ 2 + C_ 2 + C_ 4 + D_ 2 + D_ 2 + D_ 4 + C_ 8 loopchannel 0, Music_DefeatedWildMon_branch_23bce @@ -146,158 +146,158 @@ Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e) executemusic notetype 12, 2, 0 octave 5 - note E_, 1 + E_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 octave 5 - note D#, 1 + D# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 octave 5 - note E_, 1 + E_ 1 rest 3 octave 4 - note D#, 4 + D# 4 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note G_, 1 + G_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 3 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 1 octave 4 - note F_, 1 + F_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note G_, 1 + G_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 3 octave 5 - note F_, 1 + F_ 1 rest 3 octave 4 - note D#, 4 + D# 4 loopchannel 0, Music_DefeatedWildMon_branch_23c21 -; 0x23cad
\ No newline at end of file +; 0x23cad diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index c9bf6dba..e73eb707 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,15 +1,15 @@ Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch vibrato 10, 1, 4 notetype 12, 4, 13 rest 8 - unknownmusic0xee 237 + stereopanning 237 octave 4 - note F#, 8 - unknownmusic0xee 255 + F# 8 + stereopanning 255 Music_Dungeon1_branch_7dee5:: notetype 12, 11, 2 @@ -18,210 +18,210 @@ Music_Dungeon1_branch_7dee5:: Music_Dungeon1_branch_7dee8:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 3, Music_Dungeon1_branch_7dee8 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 rest 1 - note A#, 1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 + A# 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 Music_Dungeon1_branch_7deff:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 4, Music_Dungeon1_branch_7deff callchannel Music_Dungeon1_branch_7dfd5 octave 3 - note G_, 1 - note F#, 1 - note E_, 1 - note G_, 1 + G_ 1 + F# 1 + E_ 1 + G_ 1 callchannel Music_Dungeon1_branch_7dfd5 octave 3 - note A_, 1 - note G_, 1 - note E_, 1 - note A_, 1 + A_ 1 + G_ 1 + E_ 1 + A_ 1 callchannel Music_Dungeon1_branch_7dfd5 octave 3 - note B_, 1 - note A_, 1 - note G_, 1 - note F#, 1 + B_ 1 + A_ 1 + G_ 1 + F# 1 notetype 12, 12, 3 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 + G_ 4 + F# 4 + E_ 4 + D# 4 notetype 12, 12, 2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 - note B_, 3 + B_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C_, 3 + C_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C#, 3 + C# 3 notetype 12, 12, 3 octave 3 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 - note E_, 4 - note D#, 4 - note C_, 4 + G_ 4 + F# 4 + E_ 4 + D# 4 + E_ 4 + D# 4 + C_ 4 octave 2 - note B_, 4 + B_ 4 notetype 12, 12, 2 - note B_, 1 - note A#, 1 - note G_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note A#, 1 - octave 3 - note C_, 1 + B_ 1 + A# 1 + G_ 1 + A# 1 + B_ 1 + A# 1 + G_ 1 + A# 1 + octave 3 + C_ 1 octave 2 - note B_, 1 - note G#, 1 - note B_, 1 + B_ 1 + G# 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note G#, 1 - note B_, 1 + B_ 1 + G# 1 + B_ 1 octave 3 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 octave 2 - note A_, 1 + A_ 1 octave 3 - note C_, 1 - note C#, 1 - note C_, 1 + C_ 1 + C# 1 + C_ 1 octave 2 - note A_, 1 + A_ 1 octave 3 - note C_, 1 - note D_, 1 - note C#, 1 + C_ 1 + D_ 1 + C# 1 octave 2 - note A#, 1 + A# 1 octave 3 - note C#, 1 - note D_, 1 - note C#, 1 + C# 1 + D_ 1 + C# 1 octave 2 - note A#, 1 + A# 1 octave 3 - note C#, 1 + C# 1 Music_Dungeon1_branch_7df6e:: rest 16 loopchannel 8, Music_Dungeon1_branch_7df6e notetype 12, 12, 3 callchannel Music_Dungeon1_branch_7dfbb - note B_, 2 - note G_, 2 + B_ 2 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A_, 4 - note F#, 2 + G_ 2 + A_ 4 + F# 2 callchannel Music_Dungeon1_branch_7dfbb - note A#, 2 - note G_, 2 - note B_, 4 - note G_, 2 - note F#, 2 - note G_, 2 - note D#, 2 + A# 2 + G_ 2 + B_ 4 + G_ 2 + F# 2 + G_ 2 + D# 2 notetype 12, 12, 2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 - note B_, 3 + B_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C_, 3 + C_ 3 callchannel Music_Dungeon1_branch_7dfc5 - note C#, 3 + C# 3 notetype 12, 12, 7 octave 3 - note F#, 8 - note D#, 8 + F# 8 + D# 8 notetype 12, 12, 2 callchannel Music_Dungeon1_branch_7dfaa callchannel Music_Dungeon1_branch_7dfaa loopchannel 0, Music_Dungeon1_branch_7dee5 Music_Dungeon1_branch_7dfaa:: - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 rest 1 - note A#, 1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 + A# 1 + E_ 1 + D# 1 + B_ 1 + A# 1 + G_ 1 + G# 1 rest 1 - note A#, 1 + A# 1 endchannel Music_Dungeon1_branch_7dfbb:: octave 2 - note G_, 2 - note A#, 4 - note G_, 2 + G_ 2 + A# 4 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A#, 2 + G_ 2 + A# 2 endchannel Music_Dungeon1_branch_7dfc5:: octave 3 - note E_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note A_, 1 - note E_, 1 - note A#, 1 - note E_, 1 - note B_, 1 - note E_, 1 + E_ 1 + E_ 1 + F_ 1 + E_ 1 + G_ 1 + E_ 1 + A_ 1 + E_ 1 + A# 1 + E_ 1 + B_ 1 + E_ 1 octave 4 - note C_, 1 + C_ 1 endchannel Music_Dungeon1_branch_7dfd5:: - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 4 octave 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 endchannel @@ -231,10 +231,10 @@ Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde) duty 3 notetype 12, 0, 15 octave 4 - note G#, 8 + G# 8 notetype 12, 4, 13 octave 5 - note D_, 8 + D_ 8 Music_Dungeon1_branch_7dfeb:: notetype 12, 12, 2 @@ -243,23 +243,23 @@ Music_Dungeon1_branch_7dfed:: callchannel Music_Dungeon1_branch_7e097 loopchannel 3, Music_Dungeon1_branch_7dfed octave 2 - note E_, 1 - note E_, 1 - note B_, 1 + E_ 1 + E_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 rest 2 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note E_, 1 - note E_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note D#, 1 + B_ 1 + E_ 1 + E_ 1 + A_ 1 + G_ 1 + F_ 1 + F# 1 + G_ 1 + D# 1 Music_Dungeon1_branch_7e006:: callchannel Music_Dungeon1_branch_7e097 @@ -267,52 +267,52 @@ Music_Dungeon1_branch_7e006:: rest 2 callchannel Music_Dungeon1_branch_7e0ab octave 3 - note C_, 4 + C_ 4 callchannel Music_Dungeon1_branch_7e0ab octave 3 - note C#, 4 + C# 4 callchannel Music_Dungeon1_branch_7e0ab octave 3 - note D#, 4 + D# 4 notetype 12, 13, 3 octave 4 - note E_, 4 - note D#, 4 - note C_, 4 + E_ 4 + D# 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e0b5 octave 3 - note F#, 4 + F# 4 callchannel Music_Dungeon1_branch_7e0b5 octave 3 - note G_, 4 + G_ 4 callchannel Music_Dungeon1_branch_7e0b5 octave 3 - note A#, 4 + A# 4 notetype 12, 13, 3 octave 4 - note E_, 4 - note D#, 4 - note C_, 4 + E_ 4 + D# 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 - note G_, 4 - note F#, 2 + B_ 4 + G_ 4 + F# 2 notetype 12, 13, 6 - note E_, 8 - note F_, 8 - note F#, 8 - note G_, 8 + E_ 8 + F_ 8 + F# 8 + G_ 8 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e0ba rest 10 - note E_, 1 + E_ 1 rest 1 callchannel Music_Dungeon1_branch_7e0ba rest 12 @@ -322,38 +322,38 @@ Music_Dungeon1_branch_7e006:: rest 14 notetype 12, 13, 3 callchannel Music_Dungeon1_branch_7e0cd - note D#, 4 + D# 4 callchannel Music_Dungeon1_branch_7e0cd - note D#, 2 + D# 2 rest 2 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e0c0 rest 2 octave 3 - note F#, 4 + F# 4 octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C_, 1 + C_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 rest 2 octave 3 - note G_, 4 + G_ 4 callchannel Music_Dungeon1_branch_7e0c0 octave 3 - note A#, 4 + A# 4 notetype 12, 13, 6 - note B_, 8 + B_ 8 octave 4 - note D#, 8 + D# 8 notetype 12, 13, 2 callchannel Music_Dungeon1_branch_7e097 callchannel Music_Dungeon1_branch_7e097 @@ -361,83 +361,83 @@ Music_Dungeon1_branch_7e006:: Music_Dungeon1_branch_7e097:: octave 2 - note E_, 1 - note E_, 1 - note B_, 1 + E_ 1 + E_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 rest 2 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note E_, 1 - note E_, 1 - note B_, 1 + B_ 1 + E_ 1 + E_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 rest 2 - note C_, 1 + C_ 1 octave 2 - note B_, 1 + B_ 1 endchannel Music_Dungeon1_branch_7e0ab:: octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 endchannel Music_Dungeon1_branch_7e0b5:: octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 10 endchannel Music_Dungeon1_branch_7e0ba:: octave 1 - note E_, 1 - note G_, 1 - note E_, 1 - note D#, 1 + E_ 1 + G_ 1 + E_ 1 + D# 1 endchannel Music_Dungeon1_branch_7e0c0:: octave 2 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 4 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 endchannel Music_Dungeon1_branch_7e0cd:: octave 3 - note E_, 6 - note G_, 6 - note E_, 4 - note A_, 6 + E_ 6 + G_ 6 + E_ 4 + A_ 6 octave 4 - note C_, 6 - octave 3 - note B_, 4 - note G_, 6 - note A#, 6 - note F#, 4 - note E_, 6 - note F#, 6 + C_ 6 + octave 3 + B_ 4 + G_ 6 + A# 6 + F# 4 + E_ 6 + F# 6 endchannel @@ -446,49 +446,49 @@ Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc) vibrato 8, 2, 6 rest 14 octave 4 - note D_, 1 - note D#, 1 + D_ 1 + D# 1 Music_Dungeon1_branch_7e0e5:: callchannel Music_Dungeon1_branch_7e140 callchannel Music_Dungeon1_branch_7e140 octave 5 - note E_, 2 + E_ 2 rest 4 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 octave 4 - note F#, 4 + F# 4 callchannel Music_Dungeon1_branch_7e154 octave 4 - note G_, 4 + G_ 4 callchannel Music_Dungeon1_branch_7e154 octave 4 - note A_, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note F#, 4 + A_ 4 + B_ 4 + A# 4 + G_ 4 + F# 4 rest 6 callchannel Music_Dungeon1_branch_7e177 - note B_, 4 - note A#, 4 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 + B_ 4 + A# 4 + G_ 4 + F# 4 + G_ 4 + F# 4 + E_ 4 + D# 4 callchannel Music_Dungeon1_branch_7e15e rest 12 callchannel Music_Dungeon1_branch_7e15e rest 12 callchannel Music_Dungeon1_branch_7e15e rest 10 - note E_, 1 + E_ 1 rest 1 callchannel Music_Dungeon1_branch_7e15e rest 12 @@ -496,128 +496,128 @@ Music_Dungeon1_branch_7e0e5:: rest 12 callchannel Music_Dungeon1_branch_7e15e rest 10 - note D_, 1 - note D#, 1 + D_ 1 + D# 1 callchannel Music_Dungeon1_branch_7e164 callchannel Music_Dungeon1_branch_7e164 - note E_, 2 + E_ 2 rest 4 callchannel Music_Dungeon1_branch_7e177 - note B_, 8 - note F#, 6 - note D_, 1 - note D#, 1 + B_ 8 + F# 6 + D_ 1 + D# 1 rest 16 rest 16 loopchannel 0, Music_Dungeon1_branch_7e0e5 Music_Dungeon1_branch_7e140:: octave 5 - note E_, 4 - note B_, 4 - note A#, 4 + E_ 4 + B_ 4 + A# 4 octave 6 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 5 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 + G# 4 + G_ 4 + B_ 4 + A# 4 + E_ 4 + D# 4 + A_ 4 + G# 4 + E_ 4 + F# 4 + D# 4 endchannel Music_Dungeon1_branch_7e154:: octave 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 4 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 endchannel Music_Dungeon1_branch_7e15e:: octave 3 - note E_, 1 - note G_, 1 - note E_, 1 - note D#, 1 + E_ 1 + G_ 1 + E_ 1 + D# 1 endchannel Music_Dungeon1_branch_7e164:: - note E_, 4 - note B_, 4 - note A#, 4 + E_ 4 + B_ 4 + A# 4 octave 4 - note D_, 4 - note C#, 4 - octave 3 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 + D_ 4 + C# 4 + octave 3 + G# 4 + G_ 4 + B_ 4 + A# 4 + E_ 4 + D# 4 + A_ 4 + G# 4 + E_ 4 + F# 4 + D# 4 endchannel Music_Dungeon1_branch_7e177:: octave 4 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 4 + F# 4 rest 6 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note G_, 4 + G_ 4 rest 6 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note A#, 4 + E_ 1 + E_ 1 + A# 4 endchannel Music_Dungeon1_Ch4:: ; 7e18a (1f:618a) dspeed 12 rest 14 - dnote 1, cymbal1 - dnote 1, cymbal1 + cymbal1 1 + cymbal1 1 Music_Dungeon1_branch_7e190:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e190 - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 2, cymbal1 - dnote 2, cymbal1 + cymbal2 4 + cymbal1 4 + cymbal2 4 + cymbal1 2 + cymbal1 2 Music_Dungeon1_branch_7e1a1:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e1a1 - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, cymbal2 + cymbal2 4 + cymbal1 4 + cymbal2 4 + cymbal2 4 Music_Dungeon1_branch_7e1b0:: callchannel Music_Dungeon1_branch_7e1fa @@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1ba callchannel Music_Dungeon1_branch_7e202 - dnote 4, snare7 - dnote 4, snare8 - dnote 4, snare8 + snare7 4 + snare8 4 + snare8 4 rest 2 - dnote 2, snare7 - dnote 4, cymbal2 + snare7 2 + cymbal2 4 Music_Dungeon1_branch_7e1cf:: rest 16 @@ -643,34 +643,34 @@ Music_Dungeon1_branch_7e1cf:: Music_Dungeon1_branch_7e1d5:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1d5 - dnote 4, cymbal1 - dnote 4, cymbal1 - dnote 4, cymbal1 + cymbal1 4 + cymbal1 4 + cymbal1 4 rest 2 - dnote 1, cymbal1 - dnote 1, cymbal1 + cymbal1 1 + cymbal1 1 callchannel Music_Dungeon1_branch_7e1f1 callchannel Music_Dungeon1_branch_7e1f1 loopchannel 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, cymbal1 + cymbal2 4 + cymbal1 4 + cymbal2 4 + cymbal1 4 endchannel Music_Dungeon1_branch_7e1fa:: - dnote 1, cymbal1 - dnote 1, cymbal1 + cymbal1 1 + cymbal1 1 rest 10 - dnote 4, cymbal3 + cymbal3 4 endchannel Music_Dungeon1_branch_7e202:: - dnote 4, snare7 - dnote 4, snare8 - dnote 4, snare8 - dnote 4, snare9 + snare7 4 + snare8 4 + snare8 4 + snare9 4 endchannel -; 0x7e20b
\ No newline at end of file +; 0x7e20b diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 028d6785..e65de5be 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,64 +1,64 @@ Music_Dungeon2_Ch1:: ; 7e887 (1f:6887) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: notetype 12, 11, 2 octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + A# 4 + A# 4 + A# 4 + A# 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 octave 5 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 + C# 4 + C# 4 + C# 4 + C# 4 octave 3 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + A# 4 + A# 4 + A# 4 + A# 4 octave 2 - note G_, 2 - note A#, 4 - note G_, 2 + G_ 2 + A# 4 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A#, 2 - note B_, 2 - note G_, 2 + G_ 2 + A# 2 + B_ 2 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A_, 4 - note F#, 2 + G_ 2 + A_ 4 + F# 2 loopchannel 2, Music_Dungeon2_branch_7e892 notetype 12, 1, 15 octave 3 - note E_, 16 - note C_, 16 - note D_, 16 + E_ 16 + C_ 16 + D_ 16 octave 2 - note A#, 16 + A# 16 rest 16 rest 16 rest 16 @@ -77,77 +77,77 @@ Music_Dungeon2_branch_7e8db:: duty 3 notetype 12, 12, 2 octave 3 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + C_ 4 + C_ 4 + C_ 4 + C_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + C_ 4 + C_ 4 + C_ 4 + C_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 octave 4 - note F#, 4 - note F#, 4 - note F#, 4 - note F#, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note G_, 4 - note G_, 4 - note G_, 4 - note F#, 4 + F# 4 + F# 4 + F# 4 + F# 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + G_ 4 + G_ 4 + G_ 4 + F# 4 loopchannel 2, Music_Dungeon2_branch_7e8db octave 3 - note E_, 2 - note G_, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note E_, 2 + E_ 2 + G_ 2 + E_ 2 + D# 2 + E_ 2 + E_ 2 octave 5 - note E_, 2 + E_ 2 rest 2 - note D#, 2 + D# 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note C#, 2 - note C_, 2 + C# 2 + C_ 2 octave 4 - note E_, 2 - note G_, 2 + E_ 2 + G_ 2 octave 3 - note A#, 2 - note C#, 2 - note A#, 2 - note A_, 2 - note A#, 2 - note G_, 2 + A# 2 + C# 2 + A# 2 + A_ 2 + A# 2 + G_ 2 octave 5 - note G_, 2 + G_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note F_, 2 + F_ 2 rest 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 + E_ 2 + D# 2 + D_ 2 + C# 2 rest 16 rest 16 rest 16 @@ -155,10 +155,10 @@ Music_Dungeon2_branch_7e8db:: notetype 12, 12, 7 duty 1 octave 4 - note E_, 16 - note D_, 16 - note C_, 16 - note D_, 16 + E_ 16 + D_ 16 + C_ 16 + D_ 16 loopchannel 0, Music_Dungeon2_branch_7e8db @@ -169,92 +169,92 @@ Music_Dungeon2_Ch3:: ; 7e93b (1f:693b) Music_Dungeon2_branch_7e940:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 16, Music_Dungeon2_branch_7e940 - note E_, 4 + E_ 4 rest 4 rest 4 - note E_, 4 - note C_, 4 + E_ 4 + C_ 4 rest 4 rest 4 - note C_, 4 - note D_, 4 + C_ 4 + D_ 4 rest 4 rest 4 - note D_, 4 + D_ 4 octave 3 - note A#, 4 + A# 4 rest 4 rest 4 - note A#, 4 + A# 4 Music_Dungeon2_branch_7e958:: octave 5 - note E_, 2 + E_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note A#, 2 + A# 2 rest 2 octave 6 - note D_, 2 + D_ 2 rest 2 - note C#, 2 + C# 2 rest 2 octave 5 - note G#, 2 + G# 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note A#, 2 + A# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note D#, 2 + D# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note D#, 2 + D# 2 rest 2 loopchannel 3, Music_Dungeon2_branch_7e958 octave 4 - note E_, 4 - note B_, 4 - note A#, 4 + E_ 4 + B_ 4 + A# 4 octave 5 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 4 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 + G# 4 + G_ 4 + B_ 4 + A# 4 + E_ 4 + D# 4 + A_ 4 + G# 4 + E_ 4 + F# 4 + D# 4 octave 3 - note E_, 16 - note C_, 16 - note D_, 16 + E_ 16 + C_ 16 + D_ 16 octave 2 - note A#, 16 + A# 16 octave 3 - note E_, 16 - note F_, 16 - note G_, 16 + E_ 16 + F_ 16 + G_ 16 octave 3 - note B_, 16 + B_ 16 rest 16 rest 16 rest 16 @@ -269,36 +269,36 @@ Music_Dungeon2_branch_7e958:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 0, Music_Dungeon2_branch_7e940 octave 2 - note G_, 2 - note A#, 4 - note G_, 2 + G_ 2 + A# 4 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A_, 2 - note A#, 2 - note G_, 2 + G_ 2 + A_ 2 + A# 2 + G_ 2 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 2 - note A#, 2 - note G_, 2 + G_ 2 + A# 2 + G_ 2 rest 2 endchannel Music_Dungeon2_branch_7e9d1:: octave 4 - note E_, 2 + E_ 2 rest 4 octave 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 octave 4 - note F#, 4 + F# 4 endchannel @@ -306,13 +306,13 @@ Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc) dspeed 12 Music_Dungeon2_branch_7e9dd:: - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, cymbal1 - dnote 4, snare8 - dnote 4, cymbal1 - dnote 4, cymbal2 - dnote 4, snare9 - dnote 4, snare7 + cymbal1 4 + cymbal2 4 + cymbal1 4 + snare8 4 + cymbal1 4 + cymbal2 4 + snare9 4 + snare7 4 loopchannel 0, Music_Dungeon2_branch_7e9dd -; 0x7e9f1
\ No newline at end of file +; 0x7e9f1 diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index dd4acc4c..1bfdb682 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,8 +1,8 @@ Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1) - tempo 0, 160 - stereopanning 119 + tempo 160 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: @@ -12,17 +12,17 @@ Music_Dungeon3_branch_7e9fe:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 3, Music_Dungeon3_branch_7e9fe octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 - note D#, 2 - note E_, 2 + D# 2 + G_ 2 + D# 2 + E_ 2 Music_Dungeon3_branch_7ea11:: callchannel Music_Dungeon3_branch_7eac1 @@ -32,32 +32,32 @@ Music_Dungeon3_branch_7ea18:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 4, Music_Dungeon3_branch_7ea18 octave 4 - note F_, 2 - note F_, 2 + F_ 2 + F_ 2 rest 2 - note F_, 2 - note E_, 2 - note E_, 2 - note D#, 2 - note D#, 2 + F_ 2 + E_ 2 + E_ 2 + D# 2 + D# 2 rest 2 - note D#, 2 - note D_, 2 - note D_, 2 + D# 2 + D_ 2 + D_ 2 callchannel Music_Dungeon3_branch_7eafc octave 4 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 rest 2 - note D_, 2 - note D#, 2 - note D#, 2 - note E_, 2 - note E_, 2 + D_ 2 + D# 2 + D# 2 + E_ 2 + E_ 2 rest 2 - note E_, 2 - note F_, 2 - note F_, 2 + E_ 2 + F_ 2 + F_ 2 Music_Dungeon3_branch_7ea3c:: callchannel Music_Dungeon3_branch_7eace @@ -67,271 +67,271 @@ Music_Dungeon3_branch_7ea43:: callchannel Music_Dungeon3_branch_7eadd loopchannel 3, Music_Dungeon3_branch_7ea43 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note F_, 2 - note G#, 2 - note E_, 2 + A_ 2 + F_ 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 callchannel Music_Dungeon3_branch_7eaea callchannel Music_Dungeon3_branch_7eaea octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 rest 16 rest 8 callchannel Music_Dungeon3_branch_7eaf7 callchannel Music_Dungeon3_branch_7eaf7 callchannel Music_Dungeon3_branch_7eaf7 callchannel Music_Dungeon3_branch_7eaf7 - note D#, 2 + D# 2 rest 16 rest 16 loopchannel 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 endchannel Music_Dungeon3_branch_7eac1:: - note E_, 2 - note G#, 2 + E_ 2 + G# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note E_, 2 - note G#, 2 + E_ 2 + G# 2 endchannel Music_Dungeon3_branch_7eace:: octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note D#, 2 + G_ 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note D#, 2 + G_ 2 + D# 2 octave 2 - note B_, 2 + B_ 2 endchannel Music_Dungeon3_branch_7eadd:: - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note A_, 2 - note F_, 2 + A_ 2 + F_ 2 endchannel Music_Dungeon3_branch_7eaea:: octave 3 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G#, 2 - note E_, 2 + G# 2 + E_ 2 octave 4 - note C_, 2 + C_ 2 endchannel Music_Dungeon3_branch_7eaf7:: - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + D# 2 + G_ 2 + D# 2 + C# 6 endchannel Music_Dungeon3_branch_7eafc:: - tempo 0, 168 + tempo 168 octave 1 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - tempo 0, 176 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + tempo 176 octave 1 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - tempo 0, 184 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + tempo 184 octave 1 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - tempo 0, 192 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + tempo 192 octave 1 - note A_, 1 - note A#, 1 - note B_, 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - tempo 0, 200 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + tempo 200 octave 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - tempo 0, 208 + C_ 1 + C# 1 + D_ 1 + D# 1 + tempo 208 octave 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - tempo 0, 216 + C_ 1 + C# 1 + D_ 1 + tempo 216 octave 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - note C#, 1 - tempo 0, 224 + C_ 1 + C# 1 + tempo 224 octave 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 2 - note C_, 1 - tempo 0, 160 + C_ 1 + tempo 160 endchannel @@ -342,91 +342,91 @@ Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68) Music_Dungeon3_branch_7eb6d:: notetype 12, 13, 3 octave 4 - note D#, 6 - note C#, 6 + D# 6 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 - note A#, 2 - note B_, 6 + B_ 2 + A# 2 + B_ 6 octave 4 - note C#, 8 + C# 8 rest 2 - note G#, 6 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 + G# 6 + F# 6 + E_ 2 + F# 2 + G# 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + F# 6 + E_ 2 + F# 2 + G# 2 octave 5 - note C_, 2 - octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note D#, 2 - note E_, 6 - note F#, 6 - note E_, 4 - note D#, 6 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - note A#, 2 - note B_, 6 - octave 4 - note C#, 8 + C_ 2 + octave 4 + G# 2 + F# 6 + E_ 2 + D# 2 + E_ 6 + F# 6 + E_ 4 + D# 6 + C# 6 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 + octave 3 + B_ 2 + A# 2 + B_ 6 + octave 4 + C# 8 rest 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 rest 2 - note G#, 2 - note A_, 2 - note A_, 2 - note A#, 2 - note A#, 2 + G# 2 + A_ 2 + A_ 2 + A# 2 + A# 2 rest 2 - note A#, 2 - note B_, 2 - note B_, 2 + A# 2 + B_ 2 + B_ 2 rest 8 rest 8 rest 8 @@ -436,174 +436,174 @@ Music_Dungeon3_branch_7eb6d:: rest 8 rest 8 octave 4 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 rest 2 - note B_, 2 - note A#, 2 - note A#, 2 - note A_, 2 - note A_, 2 + B_ 2 + A# 2 + A# 2 + A_ 2 + A_ 2 rest 2 - note A_, 2 - note G#, 2 - note G#, 2 - note C#, 8 + A_ 2 + G# 2 + G# 2 + C# 8 rest 2 octave 3 - note B_, 6 - note A#, 2 - note B_, 2 + B_ 6 + A# 2 + B_ 2 octave 4 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C# 2 + D# 2 + G_ 2 + D# 2 + C# 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 6 - note G_, 6 + C# 2 + D# 6 + G_ 6 octave 3 - note G_, 8 + G_ 8 rest 2 - note F_, 6 - note E_, 2 - note F_, 2 - note A_, 2 + F_ 6 + E_ 2 + F_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note G_, 6 - note F_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 6 + F_ 2 + G_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 - note G_, 6 - note A_, 6 + A_ 2 + G_ 6 + A_ 6 octave 4 - note C#, 6 - note G_, 8 + C# 6 + G_ 8 rest 2 - note F_, 6 - note E_, 2 - note F_, 2 - note A_, 2 + F_ 6 + E_ 2 + F_ 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 - note G_, 6 - note A_, 2 + A_ 2 + G_ 6 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 - note G_, 6 - note A_, 6 + A_ 2 + G_ 6 + A_ 6 octave 5 - note C#, 6 + C# 6 octave 4 - note F#, 8 + F# 8 rest 2 - note E_, 6 - note D#, 2 - note E_, 2 - note G#, 2 + E_ 6 + D# 2 + E_ 2 + G# 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 + G# 2 + F# 6 + E_ 2 + F# 2 + G# 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G#, 2 - note F#, 6 - note G#, 6 + G# 2 + F# 6 + G# 6 octave 5 - note C_, 6 - octave 3 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 + C_ 6 + octave 3 + D# 2 + G_ 2 + D# 2 + C# 6 + D# 2 + G_ 2 + D# 2 + C# 6 octave 2 - note E_, 2 - note G#, 2 - octave 3 - note C_, 2 - note E_, 2 - note G#, 2 - octave 4 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note D#, 2 + E_ 2 + G# 2 + octave 3 + C_ 2 + E_ 2 + G# 2 + octave 4 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + E_ 2 + G# 2 + C_ 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 - note G_, 2 + D# 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D#, 2 + D# 2 loopchannel 0, Music_Dungeon3_branch_7eb6d @@ -623,66 +623,66 @@ Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a) rest 12 notetype 6, 1, 0 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 rest 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 rest 16 rest 16 rest 10 octave 5 - note E_, 8 + E_ 8 octave 4 - note B_, 8 + B_ 8 octave 5 - note D#, 8 + D# 8 octave 4 - note A#, 8 + A# 8 octave 5 - note D_, 8 + D_ 8 octave 4 - note A_, 8 + A_ 8 octave 5 - note C#, 8 + C# 8 octave 4 - note G#, 8 + G# 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note G_, 8 - note B_, 8 - note F#, 8 - note A#, 8 - note F_, 8 - note A_, 8 - note E_, 8 + G_ 8 + B_ 8 + F# 8 + A# 8 + F_ 8 + A_ 8 + E_ 8 rest 16 rest 16 rest 8 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 rest 2 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 octave 3 - note B_, 1 + B_ 1 rest 10 rest 16 notetype 12, 1, 0 @@ -754,4 +754,4 @@ Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4) rest 16 rest 10 endchannel -; 0x7ed0f
\ No newline at end of file +; 0x7ed0f diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index c0b7e144..eabc06ec 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,383 +1,383 @@ Music_FinalBattle_Ch1:: ; 233a6 (8:73a6) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 2 octave 3 - note F#, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 + F# 1 + F_ 1 + F# 1 + G_ 1 + F# 1 + G_ 1 + G# 1 + G_ 1 notetype 12, 10, 2 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + G# 1 + A_ 1 + G# 1 + A_ 1 + A# 1 + A_ 1 + A# 1 + B_ 1 notetype 12, 9, 2 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 + C_ 1 + C# 1 notetype 12, 8, 2 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 notetype 12, 12, 1 octave 3 - note E_, 1 - note E_, 7 - note F_, 1 - note F_, 7 - note G_, 1 - note G_, 7 - note F_, 1 - note F_, 7 - note E_, 1 - note E_, 7 - note F_, 1 - note F_, 7 - note G_, 1 - note G_, 7 - note G#, 1 - note G#, 3 - note D#, 4 + E_ 1 + E_ 7 + F_ 1 + F_ 7 + G_ 1 + G_ 7 + F_ 1 + F_ 7 + E_ 1 + E_ 7 + F_ 1 + F_ 7 + G_ 1 + G_ 7 + G# 1 + G# 3 + D# 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 3 - note E_, 4 + E_ 4 notetype 12, 12, 1 - note F_, 1 - note F_, 3 + F_ 1 + F_ 3 notetype 12, 11, 3 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note G_, 1 - note G_, 3 + G_ 1 + G_ 3 notetype 12, 11, 3 - note G_, 4 + G_ 4 notetype 12, 12, 1 - note F_, 1 - note F_, 3 + F_ 1 + F_ 3 notetype 12, 11, 3 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 3 - note E_, 4 + E_ 4 notetype 12, 12, 1 - note F_, 1 - note F_, 3 + F_ 1 + F_ 3 notetype 12, 11, 3 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note G_, 1 - note G_, 3 + G_ 1 + G_ 3 notetype 12, 11, 3 - note G_, 4 + G_ 4 notetype 12, 12, 1 - note G#, 1 - note G#, 3 + G# 1 + G# 3 notetype 12, 11, 7 - note D#, 4 + D# 4 Music_FinalBattle_branch_23429:: notetype 12, 11, 7 octave 3 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 4 + F# 4 + F_ 4 + F# 4 notetype 12, 11, 1 - note F#, 2 - note F_, 1 - note F#, 1 - note A_, 1 - note F#, 2 - note F#, 1 + F# 2 + F_ 1 + F# 1 + A_ 1 + F# 2 + F# 1 notetype 12, 11, 7 octave 2 - note B_, 6 + B_ 6 notetype 12, 10, 0 octave 3 - note D_, 6 + D_ 6 notetype 12, 11, 7 - note F#, 4 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + F# 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 12 - note A#, 4 + F# 4 + F_ 4 + F# 12 + A# 4 notetype 12, 5, 14 - note B_, 12 + B_ 12 notetype 12, 11, 2 - note E_, 3 - note E_, 3 - note E_, 2 - note E_, 1 - note F#, 1 - note E_, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 + E_ 3 + E_ 3 + E_ 2 + E_ 1 + F# 1 + E_ 1 + B_ 1 + F# 1 + E_ 1 + F# 1 + B_ 1 + F# 1 + E_ 1 + F# 1 + B_ 1 + F# 1 + E_ 1 + F# 1 + B_ 1 + F# 1 notetype 12, 12, 2 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 + E_ 1 + F# 1 + B_ 1 + F# 1 notetype 12, 13, 2 - note E_, 1 - note F#, 1 - note B_, 1 + E_ 1 + F# 1 + B_ 1 notetype 12, 12, 1 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 3 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 3 notetype 12, 11, 5 - note D_, 4 + D_ 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 5 - note F_, 4 + F_ 4 notetype 12, 12, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 11, 5 - note D_, 4 + D_ 4 notetype 12, 12, 1 - note E_, 1 + E_ 1 notetype 12, 11, 7 - note E_, 7 + E_ 7 notetype 12, 12, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 1 - note F_, 2 - octave 4 - note C_, 1 + E_ 2 + B_ 1 + A_ 1 + E_ 2 + B_ 1 + A_ 1 + E_ 2 + B_ 1 + A_ 1 + E_ 2 + B_ 1 + A_ 3 + E_ 1 + D_ 3 + E_ 1 + D_ 3 + E_ 1 + D_ 3 + E_ 1 + D_ 1 + F_ 2 + octave 4 + C_ 1 octave 3 - note B_, 1 - note F_, 2 + B_ 1 + F_ 2 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note F_, 2 + B_ 1 + F_ 2 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note F_, 2 + B_ 1 + F_ 2 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 1 - note F#, 2 - octave 4 - note C#, 1 - note C_, 1 + B_ 3 + F_ 1 + E_ 3 + F_ 1 + E_ 3 + F_ 1 + E_ 3 + F_ 1 + E_ 1 + F# 2 + octave 4 + C# 1 + C_ 1 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 1 - note C_, 1 + C# 1 + C_ 1 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 1 - note C_, 3 + C# 1 + C_ 3 octave 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 + F# 1 + F_ 3 notetype 12, 11, 7 octave 4 - note C_, 2 + C_ 2 notetype 12, 11, 0 - note C#, 8 + C# 8 notetype 12, 11, 7 - note C#, 8 + C# 8 notetype 12, 10, 0 octave 3 - note F#, 8 - note F#, 8 + F# 8 + F# 8 notetype 12, 11, 0 octave 3 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 - note G_, 4 - note B_, 12 + A_ 8 + G_ 4 + B_ 12 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 - note A_, 8 + A_ 8 notetype 12, 11, 0 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 notetype 12, 11, 0 - note A#, 8 + A# 8 notetype 12, 11, 7 - note A#, 8 + A# 8 octave 4 - note F_, 8 + F_ 8 octave 3 - note A#, 8 + A# 8 octave 4 - note C#, 4 - note E_, 12 + C# 4 + E_ 12 octave 3 - note A_, 4 + A_ 4 octave 4 - note C#, 12 + C# 12 notetype 12, 4, 0 callchannel Music_FinalBattle_branch_23710 callchannel Music_FinalBattle_branch_23710 notetype 12, 11, 7 octave 3 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 12 + F# 4 + F_ 4 + F# 12 notetype 12, 11, 0 - note A_, 8 - note G_, 8 + A_ 8 + G_ 8 notetype 12, 11, 7 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 + E_ 4 + B_ 4 + D# 4 + A# 4 + D_ 4 + A_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note F_, 4 - note F#, 12 + F# 4 + F_ 4 + F# 12 notetype 12, 11, 0 - note A_, 8 + A_ 8 notetype 12, 11, 7 octave 4 - note C_, 8 + C_ 8 notetype 12, 11, 0 octave 3 - note B_, 8 + B_ 8 notetype 12, 11, 7 - note B_, 8 + B_ 8 notetype 12, 11, 0 octave 4 - note E_, 8 + E_ 8 notetype 12, 11, 7 - note E_, 8 + E_ 8 loopchannel 0, Music_FinalBattle_branch_23429 @@ -386,84 +386,84 @@ Music_FinalBattle_Ch2:: ; 2356a (8:756a) vibrato 8, 2, 5 notetype 12, 12, 2 octave 5 - note C_, 1 + C_ 1 octave 4 - note G#, 1 - note B_, 1 - note F#, 1 - note A_, 1 - note E_, 1 - note G_, 1 + G# 1 + B_ 1 + F# 1 + A_ 1 + E_ 1 + G_ 1 octave 5 - note C_, 1 + C_ 1 octave 4 - note F_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note D#, 1 + F_ 1 + C# 1 + E_ 1 + C_ 1 + D# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note D_, 1 + D_ 1 octave 5 - note C_, 1 + C_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note G#, 1 - note B_, 1 - note F#, 1 - note A#, 1 - note F_, 1 - note A_, 1 - octave 5 - note C_, 1 + G# 1 + B_ 1 + F# 1 + A# 1 + F_ 1 + A_ 1 + octave 5 + C_ 1 octave 3 - note G#, 1 - note D#, 1 - note G_, 1 - note D_, 1 - note F_, 1 - note C#, 1 - note E_, 1 - octave 5 - note C_, 1 + G# 1 + D# 1 + G_ 1 + D_ 1 + F_ 1 + C# 1 + E_ 1 + octave 5 + C_ 1 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 3 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 7 + E_ 1 + E_ 3 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 2 - note D#, 4 + D# 4 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 @@ -473,873 +473,873 @@ Music_FinalBattle_Ch2:: ; 2356a (8:756a) callchannel Music_FinalBattle_branch_23704 notetype 12, 12, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 4, 10 octave 3 - note G#, 4 + G# 4 Music_FinalBattle_branch_235e6:: notetype 12, 13, 7 octave 4 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 + B_ 8 notetype 12, 13, 7 - note A#, 4 - note B_, 12 + A# 4 + B_ 12 notetype 12, 11, 1 - note F_, 2 - note F#, 3 - note A_, 1 - note B_, 1 - note A_, 1 + F_ 2 + F# 3 + A_ 1 + B_ 1 + A_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 2 - note A_, 1 - note B_, 1 - note B_, 1 - note A_, 1 - note A#, 1 + B_ 2 + A_ 1 + B_ 1 + B_ 1 + A_ 1 + A# 1 notetype 12, 13, 7 octave 4 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 + B_ 8 notetype 12, 13, 7 - note A#, 4 - note B_, 12 + A# 4 + B_ 12 octave 4 - note D#, 4 - note E_, 12 + D# 4 + E_ 12 notetype 12, 10, 0 octave 3 - note B_, 8 + B_ 8 octave 4 - note D_, 8 - note F_, 8 - note D_, 8 + D_ 8 + F_ 8 + D_ 8 notetype 12, 13, 1 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 13, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 4 octave 3 - note F_, 4 + F_ 4 notetype 12, 13, 1 octave 4 - note E_, 1 - note E_, 3 + E_ 1 + E_ 3 notetype 12, 12, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 13, 1 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 notetype 12, 12, 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note D_, 2 + D_ 2 notetype 12, 12, 2 octave 4 - note E_, 1 - note E_, 1 - note D_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note F_, 1 - note E_, 1 - note E_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + D_ 1 + E_ 1 + F_ 1 + E_ 1 + D_ 1 + F_ 1 + E_ 1 + E_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + F# 1 + E_ 1 + E_ 1 + F_ 1 + E_ 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + E_ 1 notetype 12, 12, 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note D_, 2 + D_ 2 notetype 12, 13, 7 octave 4 - note E_, 4 - note F_, 2 - note F#, 12 + E_ 4 + F_ 2 + F# 12 notetype 12, 12, 2 octave 3 - note B_, 2 - note B_, 4 - note B_, 2 - note B_, 4 - note B_, 2 + B_ 2 + B_ 4 + B_ 2 + B_ 4 + B_ 2 notetype 12, 13, 7 octave 4 - note F_, 4 - note F#, 2 - note G_, 12 + F_ 4 + F# 2 + G_ 12 notetype 12, 12, 2 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 + C_ 2 + C_ 4 + C_ 2 + C_ 4 + C_ 2 notetype 12, 13, 7 - note F#, 4 - note G_, 2 - note G#, 12 + F# 4 + G_ 2 + G# 12 notetype 12, 8, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 4 notetype 12, 10, 2 - note C#, 2 - note C#, 4 - note C#, 4 + C# 2 + C# 4 + C# 4 notetype 12, 13, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 4 notetype 12, 15, 2 - note C#, 2 - note C#, 4 + C# 2 + C# 4 notetype 12, 12, 4 - note E_, 1 - note F_, 1 + E_ 1 + F_ 1 notetype 12, 12, 0 - note F#, 12 + F# 12 notetype 12, 12, 7 - note F#, 4 + F# 4 notetype 12, 1, 15 octave 3 - note F#, 8 + F# 8 notetype 12, 9, 0 - note F#, 8 + F# 8 notetype 12, 12, 7 octave 4 - note C#, 4 + C# 4 notetype 12, 12, 0 - note D_, 12 - note D_, 8 + D_ 12 + D_ 8 notetype 12, 12, 7 - note D_, 8 + D_ 8 notetype 12, 12, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 + E_ 8 notetype 12, 12, 0 octave 3 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note A_, 8 + A_ 8 notetype 12, 12, 0 octave 4 - note F_, 8 + F_ 8 notetype 12, 12, 7 - note F_, 8 + F_ 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note A#, 8 + A# 8 notetype 12, 12, 0 - note A_, 16 - note A_, 8 + A_ 16 + A_ 8 notetype 12, 12, 7 - note A_, 8 + A_ 8 notetype 12, 12, 5 callchannel Music_FinalBattle_branch_23710 notetype 12, 11, 1 callchannel Music_FinalBattle_branch_23710 notetype 12, 13, 7 octave 4 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 - note A#, 4 - note B_, 12 + B_ 8 + A# 4 + B_ 12 notetype 12, 12, 7 octave 4 - note D_, 8 + D_ 8 notetype 12, 4, 12 - note C_, 8 + C_ 8 notetype 12, 13, 7 - note E_, 8 - note D#, 8 - note D_, 8 + E_ 8 + D# 8 + D_ 8 octave 3 - note B_, 8 - note A#, 4 - note B_, 12 + B_ 8 + A# 4 + B_ 12 notetype 12, 5, 13 octave 4 - note D_, 8 + D_ 8 notetype 12, 12, 0 - note F_, 8 + F_ 8 notetype 12, 12, 0 - note E_, 8 + E_ 8 notetype 12, 12, 7 - note E_, 8 - note A#, 4 - note B_, 12 + E_ 8 + A# 4 + B_ 12 loopchannel 0, Music_FinalBattle_branch_235e6 Music_FinalBattle_branch_23704:: octave 4 - note E_, 1 - note E_, 1 - note G_, 1 + E_ 1 + E_ 1 + G_ 1 octave 5 - note C_, 1 - note E_, 1 - note C_, 1 + C_ 1 + E_ 1 + C_ 1 octave 4 - note G_, 1 - note F_, 1 + G_ 1 + F_ 1 endchannel Music_FinalBattle_branch_23710:: octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note C#, 2 - note F#, 2 - note D_, 2 + C# 2 + D_ 2 + C# 2 + F# 2 + D_ 2 endchannel Music_FinalBattle_Ch3:: ; 2371c (8:771c) notetype 12, 1, 1 octave 4 - note E_, 4 + E_ 4 octave 5 - note E_, 4 + E_ 4 octave 4 - note F_, 4 + F_ 4 octave 5 - note D#, 4 + D# 4 octave 4 - note G_, 4 + G_ 4 octave 5 - note D_, 4 + D_ 4 octave 4 - note G#, 4 - note B_, 4 - note E_, 1 - note E_, 1 + G# 4 + B_ 4 + E_ 1 + E_ 1 rest 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 6 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note D#, 4 - note E_, 1 - note E_, 1 + D# 4 + E_ 1 + E_ 1 rest 2 - note B_, 4 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 rest 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 5 - note D_, 4 + D_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note A#, 2 - note E_, 1 - note E_, 1 + A# 2 + E_ 1 + E_ 1 rest 2 - note B_, 4 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 rest 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 5 - note D_, 4 + D_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 octave 5 - note C_, 4 - note D_, 2 + C_ 4 + D_ 2 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note B_, 4 - note E_, 1 - note E_, 1 + B_ 4 + E_ 1 + E_ 1 rest 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 octave 5 - note D_, 4 + D_ 4 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note E_, 1 - note D#, 1 - note E_, 1 - note G_, 1 + E_ 1 + D# 1 + E_ 1 + G_ 1 Music_FinalBattle_branch_2377d:: octave 4 - note E_, 1 + E_ 1 octave 3 - note E_, 1 + E_ 1 rest 2 octave 4 - note F#, 4 - note D#, 1 + F# 4 + D# 1 octave 3 - note D#, 1 + D# 1 rest 2 octave 4 - note F_, 4 - note D_, 1 + F_ 4 + D_ 1 octave 3 - note D_, 1 + D_ 1 rest 2 octave 4 - note E_, 4 - note F#, 1 + E_ 4 + F# 1 octave 3 - note F#, 1 + F# 1 rest 2 octave 4 - note F#, 4 - note F_, 4 + F# 4 + F_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 - note E_, 1 + F# 2 + E_ 1 octave 3 - note E_, 1 + E_ 1 rest 2 octave 4 - note F#, 4 - note D#, 1 + F# 4 + D# 1 octave 3 - note D#, 1 + D# 1 rest 2 octave 4 - note F_, 4 - note D_, 1 + F_ 4 + D_ 1 octave 3 - note D_, 1 + D_ 1 rest 2 octave 4 - note E_, 4 - note F#, 1 + E_ 4 + F# 1 octave 3 - note F#, 1 + F# 1 rest 2 octave 4 - note F#, 4 - note F_, 4 + F# 4 + F_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 - octave 4 - note F#, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 1 - note E_, 1 + B_ 2 + octave 4 + F# 2 + E_ 1 + D# 1 + E_ 1 + F# 1 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 rest 2 - note F_, 4 - note E_, 1 - note E_, 1 + F_ 4 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 octave 3 - note B_, 6 + B_ 6 octave 4 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 rest 2 - note F_, 4 - note E_, 1 - note E_, 1 + F_ 4 + E_ 1 + E_ 1 rest 2 - note D_, 4 - note E_, 1 - note E_, 1 + D_ 4 + E_ 1 + E_ 1 octave 3 - note B_, 6 + B_ 6 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + B_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note B_, 2 - note F_, 2 + B_ 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note D#, 2 + D# 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 2 - note C_, 2 + C_ 2 + C_ 2 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 2 - note C_, 2 - note D_, 2 - note C_, 2 + C_ 2 + C_ 2 + D_ 2 + C_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 - note E_, 2 - note C#, 2 + C# 2 + C# 2 + E_ 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 - note C#, 2 - note E_, 2 - note C#, 2 + C# 2 + C# 2 + E_ 2 + C# 2 callchannel Music_FinalBattle_branch_2395b callchannel Music_FinalBattle_branch_2395b octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 + G_ 1 + F# 1 + G_ 1 + G# 1 callchannel Music_FinalBattle_branch_2396c callchannel Music_FinalBattle_branch_2396c octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 + F_ 2 octave 4 - note A#, 2 + A# 2 octave 5 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C# 2 octave 4 - note A#, 2 - note A_, 2 + A# 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note C#, 2 + C# 2 octave 4 - note A_, 2 - note G#, 2 - note G_, 2 + A_ 2 + G# 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note F#, 2 + G_ 1 + F# 1 + G_ 1 + G# 1 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + F_ 2 + F# 2 + G_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + B_ 2 + F# 2 + D# 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + F_ 2 + F# 2 + G_ 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note F#, 2 - note F_, 2 - note E_, 2 - note B_, 2 - octave 5 - note E_, 4 - octave 4 - note E_, 2 - note B_, 2 - octave 5 - note D#, 4 - octave 4 - note E_, 2 - note B_, 2 - octave 5 - note D_, 4 - octave 4 - note E_, 2 - note A_, 2 - note B_, 4 + F# 2 + F_ 2 + E_ 2 + B_ 2 + octave 5 + E_ 4 + octave 4 + E_ 2 + B_ 2 + octave 5 + D# 4 + octave 4 + E_ 2 + B_ 2 + octave 5 + D_ 4 + octave 4 + E_ 2 + A_ 2 + B_ 4 loopchannel 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 octave 4 - note F#, 2 + F# 2 octave 5 - note C#, 2 + C# 2 endchannel Music_FinalBattle_branch_2396c:: octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 octave 4 - note A_, 2 + A_ 2 octave 5 - note E_, 2 + E_ 2 endchannel -; 0x2397d
\ No newline at end of file +; 0x2397d diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index ea89ff2f..a80652e3 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,185 +1,185 @@ Music_GameCorner_Ch1:: ; 7e20b (1f:620b) - tempo 0, 120 - stereopanning 119 + tempo 120 + volume 7, 7 duty 3 vibrato 12, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 5 octave 3 - note A_, 6 + A_ 6 notetype 12, 11, 1 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 16 + G# 2 + F# 2 + E_ 2 + D# 2 + C# 2 + D# 16 Music_GameCorner_branch_7e222:: notetype 12, 11, 5 octave 3 - note C#, 4 + C# 4 octave 2 - note G#, 4 + G# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note A_, 2 - note G#, 8 + A_ 2 + G# 8 notetype 12, 10, 7 - note G#, 2 - note A_, 2 - note B_, 2 + G# 2 + A_ 2 + B_ 2 notetype 12, 11, 5 - note G#, 6 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 + G# 6 + E_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 notetype 12, 10, 7 - note F#, 8 - note D#, 8 + F# 8 + D# 8 notetype 12, 11, 5 - note D#, 4 + D# 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note D#, 4 - note B_, 2 - note A_, 8 + F# 4 + D# 4 + B_ 2 + A_ 8 notetype 12, 11, 7 octave 4 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 6 - note C#, 2 - octave 3 - note D#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note G#, 2 + E_ 2 + D# 2 + E_ 2 + D# 6 + C# 2 + octave 3 + D# 2 + E_ 2 + F# 2 + G_ 2 + G# 2 notetype 12, 9, 7 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 2 + G# 1 + G_ 1 + G# 1 + G_ 1 + G# 2 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 11, 5 - note C#, 4 + C# 4 octave 2 - note G#, 4 + G# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note A_, 2 - note G#, 8 + A_ 2 + G# 8 notetype 12, 11, 7 - note G#, 2 - note A_, 2 - note B_, 2 - note G#, 6 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 8 + G# 2 + A_ 2 + B_ 2 + G# 6 + E_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + F# 8 notetype 12, 9, 7 - note D#, 4 - note C#, 4 + D# 4 + C# 4 notetype 12, 11, 5 - note D#, 4 + D# 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note F#, 4 - note D#, 4 - note B_, 2 - note A_, 8 + F# 4 + D# 4 + B_ 2 + A_ 8 notetype 12, 11, 7 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 4 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 + F# 2 + G# 2 + A_ 2 + B_ 4 + A_ 4 + B_ 2 + A_ 2 + G# 2 + F# 2 notetype 12, 12, 2 - note E_, 4 + E_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note E_, 2 - note E_, 4 - note E_, 4 + E_ 2 + E_ 4 + E_ 4 notetype 12, 11, 7 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D#, 2 - note E_, 8 + C# 2 + D# 2 + E_ 8 notetype 12, 11, 5 octave 4 - note D#, 4 + D# 4 octave 3 - note B_, 4 - note F#, 4 - note D#, 4 + B_ 4 + F# 4 + D# 4 notetype 12, 11, 7 - note E_, 3 - note D#, 1 + E_ 3 + D# 1 notetype 12, 11, 2 - note C#, 2 - note D#, 2 - note E_, 10 + C# 2 + D# 2 + E_ 10 notetype 12, 11, 7 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note D#, 2 - note E_, 8 + C# 2 + D# 2 + E_ 8 notetype 12, 11, 5 octave 4 - note D#, 4 + D# 4 octave 3 - note B_, 4 - note F#, 4 - note A_, 4 + B_ 4 + F# 4 + A_ 4 notetype 12, 11, 7 - note G#, 2 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 8 + G# 2 + G# 1 + G_ 1 + G# 1 + G_ 1 + G# 1 + G_ 1 + G# 8 loopchannel 0, Music_GameCorner_branch_7e222 @@ -188,186 +188,186 @@ Music_GameCorner_Ch2:: ; 7e2df (1f:62df) vibrato 10, 2, 3 notetype 12, 12, 6 octave 4 - note C#, 6 + C# 6 notetype 12, 12, 1 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 duty 3 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 8 + B_ 1 + A# 1 + B_ 1 + A# 1 + B_ 1 + A# 1 + B_ 8 Music_GameCorner_branch_7e2fa:: duty 2 notetype 12, 12, 7 octave 3 - note E_, 4 + E_ 4 octave 2 - note B_, 4 - octave 3 - note G#, 4 - note E_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 14 - octave 4 - note E_, 6 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 16 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - octave 4 - note D#, 2 - note C#, 14 - note F#, 6 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A#, 2 - note B_, 16 - note E_, 4 + B_ 4 + octave 3 + G# 4 + E_ 4 + octave 4 + C# 2 + octave 3 + B_ 14 + octave 4 + E_ 6 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 + A_ 16 + F# 4 + D# 4 + A_ 4 + F# 4 + octave 4 + D# 2 + C# 14 + F# 6 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 2 + A# 2 + B_ 16 + E_ 4 octave 2 - note B_, 4 - octave 3 - note G#, 4 - note E_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 14 - octave 4 - note E_, 6 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 16 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - octave 4 - note D#, 2 - note C#, 14 - note F#, 6 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 + B_ 4 + octave 3 + G# 4 + E_ 4 + octave 4 + C# 2 + octave 3 + B_ 14 + octave 4 + E_ 6 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 + A_ 16 + F# 4 + D# 4 + A_ 4 + F# 4 + octave 4 + D# 2 + C# 14 + F# 6 + E_ 2 + D# 2 + E_ 2 + F# 2 + G# 2 notetype 12, 12, 1 - note E_, 2 + E_ 2 notetype 12, 10, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 2 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 2 notetype 12, 12, 7 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 10 + C# 2 + D# 2 + E_ 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 + C# 2 + D# 2 notetype 12, 12, 5 - note F#, 4 - note D#, 4 + F# 4 + D# 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note A_, 4 - note G#, 3 - note A_, 1 + A_ 4 + G# 3 + A_ 1 notetype 12, 12, 2 - note G#, 2 - note F#, 2 - note E_, 2 + G# 2 + F# 2 + E_ 2 notetype 12, 12, 7 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note D#, 10 + C# 2 + D_ 2 + D# 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 10 + C# 2 + D# 2 + E_ 10 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - note B_, 16 + C# 2 + D# 2 + F# 4 + D# 4 + A_ 4 + F# 4 + B_ 16 loopchannel 0, Music_GameCorner_branch_7e2fa Music_GameCorner_Ch3:: ; 7e38b (1f:638b) notetype 12, 1, 3 octave 5 - note C#, 1 + C# 1 rest 5 octave 4 - note F#, 1 + F# 1 rest 1 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A#, 1 + A# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note B_, 1 + B_ 1 rest 9 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 Music_GameCorner_branch_7e3a5:: @@ -378,23 +378,23 @@ Music_GameCorner_branch_7e3a5:: callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e481 callchannel Music_GameCorner_branch_7e496 - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 callchannel Music_GameCorner_branch_7e418 callchannel Music_GameCorner_branch_7e42d @@ -403,38 +403,38 @@ Music_GameCorner_branch_7e3a5:: callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e481 callchannel Music_GameCorner_branch_7e496 - note E_, 1 + E_ 1 rest 3 octave 3 - note B_, 1 + B_ 1 rest 3 octave 4 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e418 callchannel Music_GameCorner_branch_7e4ab - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 callchannel Music_GameCorner_branch_7e46c callchannel Music_GameCorner_branch_7e418 @@ -443,186 +443,186 @@ Music_GameCorner_branch_7e3a5:: loopchannel 0, Music_GameCorner_branch_7e3a5 Music_GameCorner_branch_7e418:: - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 endchannel Music_GameCorner_branch_7e42d:: - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 endchannel Music_GameCorner_branch_7e442:: - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 endchannel Music_GameCorner_branch_7e457:: - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 endchannel Music_GameCorner_branch_7e46c:: - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 endchannel Music_GameCorner_branch_7e481:: - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 endchannel Music_GameCorner_branch_7e496:: - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 endchannel Music_GameCorner_branch_7e4ab:: - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 endchannel -; 0x7e4c0
\ No newline at end of file +; 0x7e4c0 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index b846ca73..b4cb2a8d 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,167 +1,167 @@ Music_Gym_Ch1:: ; bcbb (2:7cbb) - tempo 0, 138 - stereopanning 119 + tempo 138 + volume 7, 7 duty 3 vibrato 8, 2, 2 - togglecall + toggleperfectpitch notetype 12, 11, 5 octave 3 - note G_, 6 - note C_, 1 - note G_, 1 - note F_, 6 + G_ 6 + C_ 1 + G_ 1 + F_ 6 octave 2 - note A#, 1 + A# 1 octave 3 - note F_, 1 - note E_, 6 + F_ 1 + E_ 6 octave 2 - note A_, 1 + A_ 1 octave 3 - note E_, 1 - note F_, 4 - note G_, 4 + E_ 1 + F_ 4 + G_ 4 Music_Gym_branch_bcd8:: - note E_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 + E_ 4 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 notetype 12, 11, 1 - note D_, 3 + D_ 3 notetype 12, 11, 5 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note E_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 + E_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 + E_ 4 + F_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + D_ 2 + D_ 1 + E_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note A#, 2 + A# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note F_, 2 + A# 2 + A_ 2 + G_ 2 + F_ 2 notetype 12, 11, 1 - note A#, 3 + A# 3 notetype 12, 11, 5 - note F_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 + F_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note A#, 2 + A# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 4 - note A#, 2 - note F_, 1 - note A#, 1 + A# 2 + A_ 2 + G_ 2 + F_ 2 + D_ 2 + D_ 1 + E_ 1 + F_ 4 + A# 2 + F_ 1 + A# 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note C_, 1 - note D_, 1 - note E_, 4 - note C_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note E_, 2 - note C_, 1 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note C_, 1 - note D_, 1 - note E_, 4 - note D_, 2 - note E_, 2 - note F_, 2 - note F_, 2 - note G_, 2 - note E_, 1 - note G_, 1 - note A#, 2 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 2 + F_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + C_ 2 + C_ 1 + D_ 1 + E_ 4 + C_ 2 + E_ 2 + D_ 2 + C_ 2 + E_ 2 + C_ 1 + E_ 1 + F_ 4 + E_ 2 + D_ 2 + E_ 2 + F_ 2 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + E_ 2 + D_ 2 + F_ 2 + D_ 2 + E_ 2 + C_ 2 + D_ 2 + C_ 2 + D_ 2 + C_ 2 + C_ 1 + D_ 1 + E_ 4 + D_ 2 + E_ 2 + F_ 2 + F_ 2 + G_ 2 + E_ 1 + G_ 1 + A# 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 + A# 2 + A_ 2 + G_ 2 + A_ 2 loopchannel 0, Music_Gym_branch_bcd8 @@ -170,121 +170,121 @@ Music_Gym_Ch2:: ; bd6b (2:7d6b) vibrato 10, 2, 5 notetype 12, 12, 7 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note A#, 6 - note F_, 1 - note A#, 1 + A# 6 + F_ 1 + A# 1 notetype 12, 10, 0 - note A_, 12 + A_ 12 notetype 12, 12, 7 - note B_, 4 + B_ 4 Music_Gym_branch_bd82:: octave 4 - note C_, 12 + C_ 12 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 2 - note D_, 3 + D_ 3 octave 3 - note A#, 1 + A# 1 notetype 12, 12, 7 - note A#, 12 + A# 12 octave 4 - note C_, 12 + C_ 12 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 4 octave 3 - note A#, 2 + A# 2 notetype 12, 12, 7 - note A#, 1 + A# 1 octave 4 - note C_, 1 - note D_, 12 - note E_, 12 - note D_, 2 - note E_, 2 + C_ 1 + D_ 12 + E_ 12 + D_ 2 + E_ 2 notetype 12, 12, 2 - note F_, 3 - note D_, 1 + F_ 3 + D_ 1 notetype 12, 12, 7 - note D_, 4 + D_ 4 notetype 12, 12, 2 - note A#, 3 - note F_, 1 + A# 3 + F_ 1 notetype 12, 12, 7 - note F_, 4 - note E_, 12 - note D_, 2 - note E_, 2 - note F_, 2 - note D_, 1 - note F_, 1 - note A#, 12 + F_ 4 + E_ 12 + D_ 2 + E_ 2 + F_ 2 + D_ 1 + F_ 1 + A# 12 octave 3 - note G_, 6 + G_ 6 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 4 - note A#, 4 - note A_, 4 - note G_, 4 - note F_, 4 + G_ 4 + A# 4 + A_ 4 + G_ 4 + F_ 4 notetype 12, 12, 3 - note E_, 2 + E_ 2 notetype 12, 12, 7 - note E_, 1 - note F_, 1 - note G_, 6 - note G_, 2 + E_ 1 + F_ 1 + G_ 6 + G_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note A#, 4 - note A_, 4 - note G_, 4 - note C_, 2 - note D_, 2 - note G_, 6 + G_ 2 + A# 4 + A_ 4 + G_ 4 + C_ 2 + D_ 2 + G_ 6 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 4 - note A#, 4 - note A_, 4 - note G_, 4 - note F_, 4 + G_ 4 + A# 4 + A_ 4 + G_ 4 + F_ 4 notetype 12, 12, 3 - note E_, 2 + E_ 2 notetype 12, 12, 7 - note E_, 1 - note F_, 1 - note G_, 4 + E_ 1 + F_ 1 + G_ 4 notetype 12, 12, 3 - note G_, 2 + G_ 2 notetype 12, 12, 7 - note G_, 1 - note A_, 1 - note A#, 4 + G_ 1 + A_ 1 + A# 4 notetype 12, 12, 4 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 7 - note C_, 1 - note D_, 1 - note E_, 12 + C_ 1 + D_ 1 + E_ 12 loopchannel 0, Music_Gym_branch_bd82 @@ -293,9 +293,9 @@ Music_Gym_Ch3:: ; bdfa (2:7dfa) rest 16 rest 10 octave 4 - note G_, 2 - note F_, 2 - note D_, 2 + G_ 2 + F_ 2 + D_ 2 Music_Gym_branch_be02:: callchannel Music_Gym_branch_be3b @@ -313,46 +313,46 @@ Music_Gym_branch_be02:: callchannel Music_Gym_branch_be3b callchannel Music_Gym_branch_be4d callchannel Music_Gym_branch_be3b - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note A_, 2 - note F_, 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + A_ 2 + F_ 2 loopchannel 0, Music_Gym_branch_be02 Music_Gym_branch_be3b:: - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 endchannel Music_Gym_branch_be44:: - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 endchannel Music_Gym_branch_be4d:: - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + F_ 2 + A# 2 + F_ 2 + A# 2 endchannel -; 0xbe56
\ No newline at end of file +; 0xbe56 diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 97162408..c4e7907e 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,549 +1,549 @@ Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370) - tempo 0, 104 - stereopanning 119 + tempo 104 + volume 7, 7 duty 3 vibrato 8, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 3 rest 6 octave 3 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + C_ 1 + octave 2 + B_ 1 octave 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - octave 2 - note F#, 1 + G# 1 + A_ 1 + A# 1 + A_ 1 + A# 1 + B_ 1 + A# 1 + B_ 1 + octave 2 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note G_, 6 - note F#, 1 + G_ 6 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note F_, 6 - note F#, 1 + F_ 6 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note G_, 6 - note F#, 1 + G_ 6 + F# 1 rest 15 - note F#, 1 + F# 1 rest 9 - note A_, 6 + A_ 6 Music_GymLeaderBattle_branch_223b0:: - note F#, 1 - octave 3 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - octave 2 - note E_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 + F# 1 + octave 3 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + octave 2 + E_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 + octave 2 + B_ 1 + A_ 1 + octave 3 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 - note F#, 1 + B_ 1 + A_ 1 + F# 1 octave 3 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 + C# 1 octave 2 - note E_, 1 - note A_, 1 + E_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 3 - note C#, 1 + C# 1 octave 2 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 rest 2 octave 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note E_, 4 + E_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note C#, 2 + C# 2 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note E_, 4 + E_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note D_, 4 + D_ 4 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 2 - note C#, 2 + C# 2 octave 1 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 2 - note C#, 2 + C# 2 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 rest 16 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note B_, 1 + B_ 1 + A_ 1 + B_ 1 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 11, 5 octave 3 - note C#, 12 + C# 12 notetype 12, 11, 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 11, 5 octave 3 - note A_, 12 + A_ 12 notetype 12, 11, 3 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D#, 2 - note F#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + F# 4 + octave 2 + B_ 2 + octave 3 + C# 2 + F# 2 + B_ 2 + F# 2 + D# 2 + F# 2 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 11, 5 octave 3 - note A_, 12 + A_ 12 notetype 12, 11, 3 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 + C# 1 + octave 2 + B_ 1 + octave 3 + C# 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + F# 1 + A_ 1 + G# 1 + F# 1 + E_ 1 + F# 1 + E_ 1 + D# 1 + C# 1 notetype 12, 11, 5 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note E_, 2 - note D#, 4 - note C#, 6 + D# 4 + E_ 4 + C# 2 + D# 6 + F# 4 + E_ 2 + D# 4 + C# 6 rest 16 rest 10 - note E_, 6 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note E_, 4 - note D#, 2 - note C#, 4 - octave 2 - note B_, 6 - octave 3 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note A_, 2 - note G#, 4 - note E_, 6 + E_ 6 + D# 4 + E_ 4 + C# 2 + D# 6 + E_ 4 + D# 2 + C# 4 + octave 2 + B_ 6 + octave 3 + D# 4 + E_ 4 + C# 2 + D# 6 + F# 4 + A_ 2 + G# 4 + E_ 6 loopchannel 0, Music_GymLeaderBattle_branch_223b0 @@ -552,299 +552,299 @@ Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1) vibrato 8, 2, 5 notetype 12, 12, 3 octave 4 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 rest 5 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note B_, 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 - note A#, 6 + A# 6 octave 3 - note B_, 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 15 - note B_, 1 + B_ 1 rest 9 octave 4 - note C#, 6 + C# 6 Music_GymLeaderBattle_branch_225e0:: notetype 12, 12, 5 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + F# 4 + E_ 4 + D# 2 + C# 2 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 notetype 12, 11, 7 duty 2 octave 3 - note A_, 8 + A_ 8 octave 4 - note C#, 8 - note E_, 8 - note C#, 8 + C# 8 + E_ 8 + C# 8 notetype 12, 12, 5 duty 3 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 + D# 4 + C# 4 + D# 4 + E_ 2 + F# 4 + E_ 4 + D# 2 + C# 2 + octave 3 + B_ 2 + octave 4 + C# 2 + D# 2 notetype 12, 11, 7 duty 2 - note C#, 8 + C# 8 octave 3 - note B_, 8 - note A_, 8 + B_ 8 + A_ 8 notetype 12, 12, 3 octave 4 - note E_, 4 - note E_, 2 - note C#, 2 + E_ 4 + E_ 2 + C# 2 notetype 12, 12, 5 duty 3 octave 1 - note B_, 1 + B_ 1 rest 3 octave 3 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note D_, 1 + D_ 1 rest 4 - note E_, 1 - note D_, 1 + E_ 1 + D_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note E_, 1 + E_ 1 rest 4 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 + F# 1 + E_ 1 + C# 1 + F# 1 rest 2 - note E_, 1 - note C#, 1 - note E_, 1 + E_ 1 + C# 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note D_, 1 + D_ 1 rest 4 - note E_, 1 - note D_, 1 + E_ 1 + D_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note E_, 1 + E_ 1 rest 4 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 + F# 1 + E_ 1 + C# 1 + F# 1 + E_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 12, 11, 0 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 - note G_, 4 + A_ 4 + G_ 4 notetype 12, 11, 0 - note F#, 8 + F# 8 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 12, 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 2 + B_ 1 + A_ 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + A_ 1 + B_ 1 notetype 12, 11, 0 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note C_, 4 + C_ 4 notetype 12, 11, 0 octave 3 - note B_, 16 + B_ 16 notetype 12, 3, 15 octave 4 - note F#, 16 + F# 16 notetype 12, 12, 3 duty 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 12, 7 octave 3 - note A_, 12 + A_ 12 notetype 12, 12, 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 12, 7 octave 4 - note C#, 12 + C# 12 notetype 12, 11, 0 - note D#, 16 + D# 16 notetype 12, 11, 7 - note D#, 16 + D# 16 notetype 12, 12, 3 octave 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 notetype 12, 12, 7 octave 4 - note C#, 12 + C# 12 notetype 12, 12, 0 - note A_, 8 - note E_, 8 - note B_, 16 + A_ 8 + E_ 8 + B_ 16 notetype 12, 12, 7 - note B_, 16 + B_ 16 notetype 12, 12, 4 octave 3 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note A_, 2 - note G#, 4 + D# 4 + E_ 4 + C# 2 + D# 6 + F# 4 + A_ 2 + G# 4 rest 2 - note B_, 1 + B_ 1 octave 4 - note D#, 1 - note F#, 1 - note A#, 1 + D# 1 + F# 1 + A# 1 notetype 12, 12, 0 - note B_, 16 - note F#, 16 - note A_, 16 + B_ 16 + F# 16 + A_ 16 octave 5 - note C#, 8 + C# 8 rest 2 notetype 12, 12, 3 octave 4 - note A_, 6 + A_ 6 loopchannel 0, Music_GymLeaderBattle_branch_225e0 @@ -853,549 +853,549 @@ Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef) notetype 12, 1, 3 rest 12 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note F#, 1 + C_ 1 + C# 1 + C_ 1 + C# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + F_ 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + F# 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F_, 6 + F_ 6 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 6 + C# 6 notetype 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note D_, 4 + D_ 4 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 13 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 4 - note C#, 12 + C# 12 octave 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 4 - note E_, 12 - note D#, 16 + E_ 12 + D# 16 octave 3 - note B_, 16 - note A_, 1 + B_ 16 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 4 - note E_, 12 - note C#, 8 - note E_, 8 + E_ 12 + C# 8 + E_ 8 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 6 + G_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 6 + C_ 6 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note F#, 2 + F# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G_, 6 + G_ 6 loopchannel 0, Music_GymLeaderBattle_branch_227b1 -; 0x22919
\ No newline at end of file +; 0x22919 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 2900cec7..d2347aa6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,28 +1,28 @@ Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 duty 3 vibrato 12, 2, 2 - togglecall + toggleperfectpitch notetype 12, 11, 3 rest 16 rest 16 rest 16 rest 12 octave 3 - note D_, 1 - note E_, 1 - note F_, 1 - note F#, 1 + D_ 1 + E_ 1 + F_ 1 + F# 1 Music_HallOfFame_branch_7fbc5:: notetype 12, 8, 0 octave 4 - note C_, 16 - note E_, 16 - note F#, 16 + C_ 16 + E_ 16 + F# 16 notetype 12, 6, 0 - note F_, 16 + F_ 16 loopchannel 3, Music_HallOfFame_branch_7fbc5 rest 16 rest 16 @@ -38,28 +38,28 @@ Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda) Music_HallOfFame_branch_7fbdf:: notetype 12, 12, 4 octave 3 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 10 - note G_, 2 - note D_, 2 - note G_, 2 + G_ 2 + D_ 2 + G_ 2 + A_ 10 + G_ 2 + D_ 2 + G_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 - note A_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 10 - note F_, 2 - note C_, 2 - note F_, 2 - note A#, 4 - note A_, 4 - note F_, 2 + B_ 4 + A_ 2 + G_ 2 + D_ 2 + G_ 2 + A_ 10 + F_ 2 + C_ 2 + F_ 2 + A# 4 + A_ 4 + F_ 2 loopchannel 0, Music_HallOfFame_branch_7fbdf @@ -68,30 +68,30 @@ Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc) Music_HallOfFame_branch_7fbfe:: octave 4 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 + D_ 2 + G_ 2 loopchannel 12, Music_HallOfFame_branch_7fbfe - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - note F#, 4 - note A_, 4 - note E_, 4 - note G_, 4 - note E_, 4 - note G_, 4 + D_ 4 + G_ 4 + D_ 4 + G_ 4 + E_ 4 + G_ 4 + E_ 4 + G_ 4 + F# 4 + A_ 4 + F# 4 + A_ 4 + E_ 4 + G_ 4 + E_ 4 + G_ 4 loopchannel 0, Music_HallOfFame_Ch3 -; 0x7fc1f
\ No newline at end of file +; 0x7fc1f diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index e0ea6ff3..32ce02c2 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,88 +1,88 @@ Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0) - tempo 0, 132 - stereopanning 119 + tempo 132 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 2 octave 2 - note A_, 8 - note A_, 8 - note A_, 8 - note A_, 4 + A_ 8 + A_ 8 + A_ 8 + A_ 4 notetype 12, 10, 4 - note A#, 4 + A# 4 Music_IndigoPlateau_branch_a605:: callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 10, 0 octave 2 - note A#, 4 + A# 4 callchannel Music_IndigoPlateau_branch_a659 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 13, 4 octave 3 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 notetype 12, 13, 4 octave 3 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 + A# 4 + A# 4 + A# 4 + A# 4 + A# 4 + A# 4 + A# 4 notetype 12, 11, 4 octave 3 - note F_, 2 + F_ 2 notetype 12, 11, 4 octave 3 - note G_, 2 + G_ 2 notetype 12, 11, 0 - note A_, 8 + A_ 8 octave 2 - note A_, 8 + A_ 8 notetype 12, 11, 7 octave 3 - note F_, 8 + F_ 8 notetype 12, 4, 14 octave 2 - note A#, 8 + A# 8 loopchannel 0, Music_IndigoPlateau_branch_a605 Music_IndigoPlateau_branch_a659:: notetype 12, 11, 2 octave 2 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 + A_ 4 endchannel @@ -91,154 +91,154 @@ Music_IndigoPlateau_Ch2:: ; a664 (2:6664) vibrato 8, 2, 5 notetype 12, 12, 2 octave 3 - note D_, 8 - note D_, 8 - note D_, 8 - note D_, 4 + D_ 8 + D_ 8 + D_ 8 + D_ 4 notetype 12, 5, 10 - note D#, 4 + D# 4 Music_IndigoPlateau_branch_a673:: callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A_, 4 + A_ 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A#, 4 + A# 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A_, 4 + A_ 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 7 - note C#, 4 + C# 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A_, 4 + A_ 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 - note A#, 4 + A# 4 callchannel Music_IndigoPlateau_branch_a6af notetype 12, 12, 5 octave 4 - note C_, 2 + C_ 2 notetype 12, 12, 7 octave 4 - note C#, 2 - note D_, 8 + C# 2 + D_ 8 octave 3 - note D_, 8 + D_ 8 octave 4 - note C_, 8 + C_ 8 notetype 12, 4, 13 octave 4 - note D#, 8 + D# 8 loopchannel 0, Music_IndigoPlateau_branch_a673 Music_IndigoPlateau_branch_a6af:: notetype 12, 12, 2 octave 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 + D_ 4 endchannel Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba) notetype 12, 1, 0 octave 4 - note D_, 2 + D_ 2 rest 6 - note D_, 2 + D_ 2 rest 6 - note D_, 2 + D_ 2 rest 6 - note D_, 2 + D_ 2 rest 2 - note D#, 4 + D# 4 Music_IndigoPlateau_branch_a6c6:: callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note F#, 4 + F# 4 callchannel Music_IndigoPlateau_branch_a6fe callchannel Music_IndigoPlateau_branch_a6fe - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note A#, 1 + A# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note A_, 8 - note D_, 8 - note A#, 8 - note D#, 8 + A_ 8 + D_ 8 + A# 8 + D# 8 loopchannel 0, Music_IndigoPlateau_branch_a6c6 Music_IndigoPlateau_branch_a6fe:: octave 4 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note D_, 2 + D_ 2 rest 2 - note A_, 4 + A_ 4 endchannel Music_IndigoPlateau_Ch4:: ; a70f (2:670f) dspeed 6 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 Music_IndigoPlateau_branch_a728:: callchannel Music_IndigoPlateau_branch_a791 @@ -255,68 +255,68 @@ Music_IndigoPlateau_branch_a728:: callchannel Music_IndigoPlateau_branch_a7a8 callchannel Music_IndigoPlateau_branch_a77e callchannel Music_IndigoPlateau_branch_a7a8 - dnote 16, mutedsnare2 - dnote 8, mutedsnare2 - dnote 8, mutedsnare3 - dnote 16, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 + mutedsnare2 16 + mutedsnare2 8 + mutedsnare3 8 + mutedsnare2 16 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 loopchannel 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 2, mutedsnare4 - dnote 2, mutedsnare3 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare4 2 + mutedsnare3 2 endchannel Music_IndigoPlateau_branch_a791:: - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare4 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 endchannel Music_IndigoPlateau_branch_a7a8:: - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 endchannel -; 0xa7c5
\ No newline at end of file +; 0xa7c5 diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index 81730736..d3464680 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,92 +1,92 @@ Music_IntroBattle_Ch1:: ; 7f844 (1f:7844) - tempo 0, 98 - stereopanning 119 + tempo 98 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 1 rest 8 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 10, 0 - note A#, 4 + A# 4 notetype 12, 11, 1 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 2, 9 octave 3 - note G_, 4 + G_ 4 notetype 12, 11, 0 - note A_, 8 + A_ 8 octave 2 - note A_, 8 + A_ 8 notetype 12, 11, 7 octave 3 - note F_, 8 + F_ 8 notetype 12, 4, 15 octave 2 - note F_, 8 + F_ 8 notetype 12, 11, 1 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D_, 4 + D_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note D#, 4 + D# 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note F_, 4 + F_ 4 notetype 12, 11, 1 octave 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 notetype 12, 11, 4 octave 3 - note G_, 4 + G_ 4 notetype 12, 11, 0 - note F#, 16 + F# 16 notetype 12, 11, 1 octave 4 - note D_, 16 + D_ 16 endchannel @@ -96,72 +96,72 @@ Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc) notetype 12, 12, 2 rest 8 octave 3 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A#, 4 + A# 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 11, 7 - note C#, 4 + C# 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 octave 3 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 7 octave 4 - note C#, 4 - note D_, 8 + C# 4 + D_ 8 octave 3 - note D_, 8 + D_ 8 octave 4 - note C_, 8 + C_ 8 octave 3 - note C_, 8 + C_ 8 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A_, 4 + A_ 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 - note A#, 4 + A# 4 notetype 12, 12, 2 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 octave 4 - note C_, 4 + C_ 4 notetype 12, 12, 2 octave 3 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 notetype 12, 12, 5 octave 4 - note C#, 4 + C# 4 notetype 12, 2, 15 - note D_, 16 + D_ 16 notetype 12, 12, 1 octave 5 - note D_, 16 + D_ 16 endchannel @@ -169,162 +169,162 @@ Music_IntroBattle_Ch3:: ; 7f91d (1f:791d) notetype 12, 1, 0 rest 8 octave 4 - note D_, 1 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 4 - note D_, 1 + F# 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 4 - note A_, 8 - note D_, 8 - note A#, 8 - note D_, 8 - note D_, 1 + A# 4 + A_ 8 + D_ 8 + A# 8 + D_ 8 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 4 - note D_, 1 + A_ 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 4 - note D_, 1 + A# 4 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 4 - note A_, 16 - note D_, 1 + A# 4 + A_ 16 + D_ 1 rest 15 endchannel Music_IntroBattle_Ch4:: ; 7f95b (1f:795b) dspeed 6 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 1, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 4, mutedsnare2 - dnote 16, mutedsnare2 - dnote 16, mutedsnare2 - dnote 2, mutedsnare2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare2 4 + mutedsnare2 16 + mutedsnare2 16 + mutedsnare2 2 rest 16 rest 14 endchannel -; 0x7fa19
\ No newline at end of file +; 0x7fa19 diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index b3c6fb4b..8d676150 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -1,23 +1,23 @@ Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 vibrato 8, 2, 4 duty 2 dutycycle 165 - togglecall + toggleperfectpitch notetype 13, 6, 7 octave 4 - note E_, 8 + E_ 8 notetype 12, 6, 7 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 + B_ 2 + G# 6 + F# 8 + G# 2 + A_ 6 + G# 8 + F# 4 + G# 4 + E_ 10 endchannel @@ -27,15 +27,15 @@ Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a) dutycycle 10 notetype 12, 10, 7 octave 4 - note E_, 8 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 + E_ 8 + B_ 2 + G# 6 + F# 8 + G# 2 + A_ 6 + G# 8 + F# 4 + G# 4 + E_ 10 endchannel -; 0x7fbaf
\ No newline at end of file +; 0x7fbaf diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 318da8a8..b2d36593 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,8 +1,8 @@ Music_Lavender_Ch1:: ; bb58 (2:7b58) - tempo 0, 152 - stereopanning 119 + tempo 152 + volume 7, 7 duty 1 - togglecall + toggleperfectpitch vibrato 0, 8, 8 notetype 12, 8, 7 rest 16 @@ -13,48 +13,48 @@ Music_Lavender_Ch1:: ; bb58 (2:7b58) Music_Lavender_branch_bb6b:: octave 3 - note G_, 8 - note G_, 8 - note E_, 8 - note E_, 8 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 4 - note C#, 8 - note C#, 8 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + G_ 8 + G_ 8 + E_ 8 + E_ 8 + G_ 4 + F# 4 + E_ 4 + B_ 4 + C# 8 + C# 8 + G_ 8 + G_ 8 + F# 8 + F# 8 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 4 - note C_, 8 - note C_, 8 + C_ 8 + C_ 8 octave 3 - note G_, 8 - note G_, 8 - note E_, 8 - note E_, 8 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 4 - note C#, 8 - note C#, 8 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note C_, 8 - note C_, 8 + G_ 8 + G_ 8 + E_ 8 + E_ 8 + G_ 4 + F# 4 + E_ 4 + B_ 4 + C# 8 + C# 8 + G_ 8 + G_ 8 + F# 8 + F# 8 + B_ 4 + G_ 4 + F# 4 + B_ 4 + C_ 8 + C_ 8 rest 16 rest 16 rest 16 @@ -69,10 +69,10 @@ Music_Lavender_Ch2:: ; bb9e (2:7b9e) Music_Lavender_branch_bba5:: octave 5 - note C_, 4 - note G_, 4 - note B_, 4 - note F#, 4 + C_ 4 + G_ 4 + B_ 4 + F# 4 loopchannel 0, Music_Lavender_branch_bba5 @@ -87,102 +87,102 @@ Music_Lavender_Ch3:: ; bbae (2:7bae) Music_Lavender_branch_bbb9:: octave 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 + E_ 4 notetype 12, 3, 5 octave 6 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 notetype 12, 2, 5 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 7 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 4 - note E_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + G_ 4 + F# 4 + B_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 + E_ 4 + E_ 16 + D_ 16 + C_ 16 + E_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note E_, 4 + E_ 4 notetype 12, 2, 5 octave 6 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 7 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + B_ 4 + G_ 4 + F# 4 + B_ 4 octave 4 - note E_, 4 - note G_, 4 - note F#, 4 - note B_, 4 + E_ 4 + G_ 4 + F# 4 + B_ 4 loopchannel 0, Music_Lavender_branch_bbb9 @@ -194,7 +194,7 @@ Music_Lavender_Ch4:: ; bc21 (2:7c21) rest 16 Music_Lavender_branch_bc26:: - dnote 8, triangle2 - dnote 8, triangle2 + triangle2 8 + triangle2 8 loopchannel 0, Music_Lavender_branch_bc26 -; 0xbc2e
\ No newline at end of file +; 0xbc2e diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 46385127..af4245ba 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,23 +1,23 @@ Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d) - tempo 0, 124 - stereopanning 119 + tempo 124 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 12, 11, 1 rest 4 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 notetype 12, 4, 15 - note D_, 4 + D_ 4 Music_MeetEvilTrainer_branch_7f6ae:: notetype 12, 10, 1 - note D_, 4 - note D_, 4 - note D_, 4 + D_ 4 + D_ 4 + D_ 4 notetype 12, 7, 0 - note D_, 4 + D_ 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae @@ -25,37 +25,37 @@ Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba) duty 1 notetype 12, 11, 6 octave 3 - note B_, 2 - note A#, 2 - note B_, 8 + B_ 2 + A# 2 + B_ 8 Music_MeetEvilTrainer_branch_7f6c2:: notetype 12, 12, 2 octave 4 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 + D# 2 + D_ 2 + C# 2 + C_ 2 octave 3 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 notetype 12, 4, 15 - note A#, 4 + A# 4 notetype 12, 12, 2 - note G_, 2 - note G#, 2 - note A_, 2 - note A#, 2 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 + G_ 2 + G# 2 + A_ 2 + A# 2 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 notetype 12, 3, 15 - note A#, 4 + A# 4 notetype 12, 12, 2 loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 @@ -64,18 +64,18 @@ Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6) notetype 12, 1, 0 rest 8 octave 4 - note F#, 1 + F# 1 rest 1 - note F_, 1 + F_ 1 rest 1 Music_MeetEvilTrainer_branch_7f6ee:: - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note A#, 4 + A# 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee -; 0x7f6f9
\ No newline at end of file +; 0x7f6f9 diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 1b097f58..35c6ec16 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,28 +1,28 @@ Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9) - tempo 0, 124 - stereopanning 119 + tempo 124 + volume 7, 7 duty 1 - togglecall + toggleperfectpitch notetype 12, 11, 2 octave 3 - note G#, 6 + G# 6 octave 4 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 + E_ 2 + D# 2 + C# 2 + C_ 2 notetype 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 - note E_, 4 + E_ 4 loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c - note E_, 4 + E_ 4 octave 2 - note B_, 4 - note B_, 4 + B_ 4 + B_ 4 octave 3 - note E_, 4 + E_ 4 loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c @@ -30,44 +30,44 @@ Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c) duty 2 notetype 12, 12, 2 octave 3 - note B_, 2 + B_ 2 notetype 12, 12, 7 octave 4 - note B_, 12 + B_ 12 Music_MeetFemaleTrainer_branch_7f726:: notetype 12, 12, 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note D#, 4 - note E_, 4 - note D#, 4 - note C#, 2 - note C_, 2 + D# 4 + E_ 4 + D# 4 + C# 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + A# 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 + B_ 4 + A_ 4 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 @@ -75,45 +75,45 @@ Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b) notetype 12, 1, 0 rest 8 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 Music_MeetFemaleTrainer_branch_7f756:: callchannel Music_MeetFemaleTrainer_branch_7f770 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 callchannel Music_MeetFemaleTrainer_branch_7f770 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note B_, 1 + B_ 1 rest 3 loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 endchannel -; 0x7f77b
\ No newline at end of file +; 0x7f77b diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 3c56aca6..8a937fc3 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,34 +1,34 @@ Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 duty 3 vibrato 20, 3, 3 - togglecall + toggleperfectpitch notetype 12, 11, 4 octave 3 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 12 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 12 rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 - note B_, 4 - note A_, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note F#, 4 - note E_, 6 - note F_, 2 - note F#, 4 - note G_, 8 - octave 4 - note D_, 8 - note E_, 16 + B_ 4 + A_ 4 + G# 2 + F# 2 + E_ 2 + D# 2 + F# 4 + E_ 6 + F_ 2 + F# 4 + G_ 8 + octave 4 + D_ 8 + E_ 16 loopchannel 0, Music_MeetMaleTrainer_branch_7f78f @@ -37,41 +37,41 @@ Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2) vibrato 24, 2, 2 notetype 12, 12, 4 octave 4 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 + E_ 1 + D# 1 + D_ 1 + C# 1 octave 3 - note B_, 12 + B_ 12 rest 2 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 9 Music_MeetMaleTrainer_branch_7f7b5:: notetype 12, 12, 4 octave 4 - note E_, 6 - note D#, 6 - note C#, 4 + E_ 6 + D# 6 + C# 4 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 + octave 4 + C# 2 notetype 12, 12, 7 - note F_, 16 + F_ 16 notetype 12, 12, 5 octave 3 - note F#, 8 + F# 8 octave 4 - note C#, 8 + C# 8 loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 @@ -79,113 +79,113 @@ Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2) notetype 12, 1, 0 rest 6 octave 4 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F#, 1 + F# 1 rest 1 Music_MeetMaleTrainer_branch_7f7ea:: - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 1 + D_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea -; 0x7f844
\ No newline at end of file +; 0x7f844 diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 303dd2f7..e095557d 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,76 +1,76 @@ Music_MeetProfOak_Ch1:: ; af59 (2:6f59) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch notetype 12, 11, 4 octave 3 - note F#, 1 - note B_, 1 + F# 1 + B_ 1 octave 4 - note D#, 1 - note E_, 1 - note F#, 12 + D# 1 + E_ 1 + F# 12 notetype 12, 10, 2 octave 3 - note E_, 6 - note B_, 10 - note E_, 6 - note B_, 10 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note B_, 10 - note E_, 6 - note B_, 10 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 + E_ 6 + B_ 10 + E_ 6 + B_ 10 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + B_ 10 + E_ 6 + B_ 10 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + D# 4 + F# 2 + F# 4 Music_MeetProfOak_branch_af85:: - note F#, 6 - note E_, 4 - note A_, 2 - note A_, 4 - note F#, 6 - note E_, 4 - note A_, 2 - note A_, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 + F# 6 + E_ 4 + A_ 2 + A_ 4 + F# 6 + E_ 4 + A_ 2 + A_ 4 + F# 6 + E_ 4 + G# 2 + G# 4 + F# 6 + E_ 4 + G# 2 + G# 4 + E_ 6 + D# 4 + F# 2 + F# 4 + E_ 6 + D# 4 + F# 2 + F# 4 + F# 6 + E_ 4 + G# 2 + G# 4 + F# 6 + E_ 4 + G# 2 + G# 4 loopchannel 0, Music_MeetProfOak_branch_af85 @@ -79,132 +79,132 @@ Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9) duty 2 notetype 12, 12, 4 octave 3 - note B_, 1 + B_ 1 octave 4 - note D#, 1 - note F#, 1 - note A#, 1 - note B_, 12 + D# 1 + F# 1 + A# 1 + B_ 12 notetype 12, 11, 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 6, 4 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 11, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 8, 1 octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 11, 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 6, 4 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 + C# 2 + D# 2 + E_ 4 + D# 2 + C# 4 notetype 12, 11, 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 8, 1 octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 + B_ 2 + A_ 2 + G# 2 + A_ 4 + B_ 2 + B_ 4 notetype 12, 11, 5 Music_MeetProfOak_branch_b005:: octave 4 - note C#, 6 + C# 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note C#, 1 - note E_, 6 - note C#, 1 - note E_, 1 - note F#, 4 - note E_, 4 - note D#, 4 - note C#, 4 + C# 1 + E_ 6 + C# 1 + E_ 1 + F# 4 + E_ 4 + D# 4 + C# 4 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 octave 4 - note E_, 8 + E_ 8 notetype 12, 6, 5 octave 4 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 octave 5 - note E_, 8 + E_ 8 notetype 12, 11, 5 octave 3 - note A_, 6 - note F#, 1 - note A_, 1 + A_ 6 + F# 1 + A_ 1 octave 4 - note D#, 8 - note E_, 4 - note D#, 4 - note C#, 4 - note C_, 4 + D# 8 + E_ 4 + D# 4 + C# 4 + C_ 4 octave 3 - note B_, 6 - note G#, 1 - note B_, 1 + B_ 6 + G# 1 + B_ 1 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note E_, 1 + E_ 1 notetype 12, 11, 7 - note G#, 16 + G# 16 loopchannel 0, Music_MeetProfOak_branch_b005 @@ -212,213 +212,213 @@ Music_MeetProfOak_Ch3:: ; b03d (2:703d) notetype 12, 1, 2 rest 10 octave 4 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 5 octave 5 - note E_, 4 + E_ 4 rest 6 octave 4 - note B_, 1 + B_ 1 rest 5 octave 5 - note E_, 4 + E_ 4 octave 4 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G#, 1 + G# 1 rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 loopchannel 2, Music_MeetProfOak_branch_b101 loopchannel 0, Music_MeetProfOak_branch_b0bc -; 0xb119
\ No newline at end of file +; 0xb119 diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 1e45ba42..fb138e61 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -1,145 +1,145 @@ Music_MeetRival_branch_b119:: - tempo 0, 100 + tempo 100 loopchannel 0, Music_MeetRival_branch_b123 Music_MeetRival_Ch1:: ; b120 (2:7120) - tempo 0, 112 + tempo 112 Music_MeetRival_branch_b123:: - stereopanning 119 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 3 octave 4 - note D_, 1 - note C#, 1 - note C_, 1 + D_ 1 + C# 1 + C_ 1 octave 3 - note B_, 1 - note A#, 2 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 6 - note D_, 1 + B_ 1 + A# 2 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 6 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 5 - note A_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 2 + A_ 2 Music_MeetRival_branch_b140:: - note B_, 4 - note A#, 2 - note A_, 4 - note G_, 2 + B_ 4 + A# 2 + A_ 4 + G_ 2 octave 4 - note C_, 4 - note D_, 2 + C_ 4 + D_ 2 rest 4 - note D_, 4 - note C#, 2 - note C_, 2 + D_ 4 + C# 2 + C_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 4 - note E_, 2 - note D_, 4 - note C_, 2 + C_ 4 + E_ 2 + D_ 4 + C_ 2 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 2 + C_ 2 rest 4 - note G_, 4 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note F#, 2 + G_ 4 + G_ 2 + F# 2 + E_ 2 + D_ 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 - note F#, 2 + D_ 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note D_, 2 + D_ 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note D_, 2 + D_ 2 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 4 - note C_, 2 - note F_, 2 + C_ 2 + F_ 2 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 + C_ 2 + F_ 2 + D# 2 + C_ 2 octave 3 - note A#, 2 - note G_, 2 + A# 2 + G_ 2 rest 4 - note A#, 4 + A# 4 octave 4 - note C_, 2 + C_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 11, 7 octave 3 - note G_, 4 - note D_, 2 - note F_, 6 - note F#, 4 - note D_, 2 + G_ 4 + D_ 2 + F_ 6 + F# 4 + D_ 2 rest 4 - note D_, 4 + D_ 4 notetype 12, 11, 3 - note A_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 2 + A_ 2 loopchannel 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: - tempo 0, 100 + tempo 100 loopchannel 0, Music_MeetRival_branch_b1a5 Music_MeetRival_branch_b1a2:: - tempo 0, 112 + tempo 112 Music_MeetRival_branch_b1a5:: - stereopanning 119 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 3 octave 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 5 - note A_, 2 - note G_, 2 - note A_, 2 + A_ 2 + G_ 2 + A_ 2 loopchannel 0, Music_MeetRival_branch_b140 @@ -148,86 +148,86 @@ Music_MeetRival_Ch2:: ; b1bb (2:71bb) vibrato 10, 2, 6 notetype 12, 12, 7 octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 2 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 6 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 2 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 6 octave 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 octave 4 - note D_, 2 - note F_, 2 - note F#, 2 + D_ 2 + F_ 2 + F# 2 Music_MeetRival_branch_b1d8:: notetype 12, 12, 7 - note G_, 4 - note D_, 2 - note F_, 6 - note F#, 4 - note G_, 2 + G_ 4 + D_ 2 + F_ 6 + F# 4 + G_ 2 rest 4 - note G_, 4 - note G_, 2 - note A#, 2 - note B_, 2 + G_ 4 + G_ 2 + A# 2 + B_ 2 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 2 - note A#, 6 - note B_, 4 + G_ 2 + A# 6 + B_ 4 octave 5 - note C_, 2 + C_ 2 rest 4 - note C_, 4 - note C_, 2 + C_ 4 + C_ 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 notetype 12, 11, 0 - note D_, 16 + D_ 16 notetype 12, 11, 5 - note D_, 6 + D_ 6 notetype 12, 12, 7 - note F_, 4 - note D_, 2 - note C_, 2 - note D_, 2 + F_ 4 + D_ 2 + C_ 2 + D_ 2 notetype 12, 11, 0 - note C_, 8 + C_ 8 notetype 12, 12, 7 - note C_, 8 + C_ 8 octave 4 - note C_, 2 + C_ 2 rest 4 - note A#, 4 - note G_, 2 - note F_, 2 + A# 4 + G_ 2 + F_ 2 notetype 12, 11, 0 - note G_, 16 + G_ 16 notetype 12, 11, 3 - note G_, 2 + G_ 2 octave 3 - note G_, 2 + G_ 2 rest 4 - note G_, 4 + G_ 4 octave 4 - note D_, 2 - note F_, 2 - note F#, 2 + D_ 2 + F_ 2 + F# 2 loopchannel 0, Music_MeetRival_branch_b1d8 Music_MeetRival_branch_b21d:: @@ -235,163 +235,163 @@ Music_MeetRival_branch_b21d:: vibrato 10, 2, 6 notetype 12, 12, 7 octave 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 octave 4 - note D_, 2 - note F_, 2 - note F#, 2 + D_ 2 + F_ 2 + F# 2 loopchannel 0, Music_MeetRival_branch_b1d8 Music_MeetRival_Ch3:: ; b233 (2:7233) notetype 12, 1, 4 octave 5 - note D_, 2 + D_ 2 rest 2 - note C#, 2 + C# 2 rest 2 - note C_, 2 + C_ 2 rest 2 octave 4 - note B_, 2 + B_ 2 rest 2 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 Music_MeetRival_branch_b24b:: - note G_, 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 4 octave 5 - note D_, 4 + D_ 4 octave 4 - note G_, 2 - note A#, 2 - note B_, 2 - note G_, 2 + G_ 2 + A# 2 + B_ 2 + G_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 octave 5 - note C_, 2 + C_ 2 rest 4 - note C_, 4 - note C_, 2 + C_ 4 + C_ 2 octave 4 - note B_, 2 - note A_, 2 - note F#, 2 - note A_, 2 + B_ 2 + A_ 2 + F# 2 + A_ 2 rest 2 - note F#, 2 - note A_, 2 - note F#, 2 + F# 2 + A_ 2 + F# 2 rest 2 - note A_, 2 - note F#, 2 - note A_, 2 + A_ 2 + F# 2 + A_ 2 rest 2 - note F#, 2 - note A_, 2 - note F#, 2 + F# 2 + A_ 2 + F# 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note A_, 2 - note E_, 2 + A_ 2 + E_ 2 octave 5 - note C_, 2 + C_ 2 rest 2 octave 4 - note E_, 2 + E_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note E_, 2 - note F_, 2 - note G_, 2 - note E_, 2 + E_ 2 + F_ 2 + G_ 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 octave 5 - note C_, 2 + C_ 2 octave 4 - note B_, 2 - note A#, 2 - note A_, 2 - note G_, 2 - note A#, 2 + B_ 2 + A# 2 + A_ 2 + G_ 2 + A# 2 rest 2 - note G_, 2 - note A#, 2 - note G_, 2 + G_ 2 + A# 2 + G_ 2 rest 2 - note A#, 2 - note G_, 2 + A# 2 + G_ 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 octave 4 - note G_, 2 + G_ 2 rest 2 octave 5 - note D_, 2 + D_ 2 loopchannel 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: notetype 12, 1, 4 octave 4 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 loopchannel 0, Music_MeetRival_branch_b24b -; 0xb2c8
\ No newline at end of file +; 0xb2c8 diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index 0f3b266f..533ac343 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,56 +1,56 @@ Music_MuseumGuy_Ch1:: ; adae (2:6dae) - tempo 0, 128 - stereopanning 119 + tempo 128 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 12, 11, 1 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 octave 2 - note B_, 4 - note B_, 1 + B_ 4 + B_ 1 octave 3 - note D#, 1 - note E_, 1 - note G#, 1 - note B_, 10 + D# 1 + E_ 1 + G# 1 + B_ 10 callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 - note E_, 4 - note E_, 4 - note E_, 2 - note E_, 6 + E_ 4 + E_ 4 + E_ 2 + E_ 6 Music_MuseumGuy_branch_add6:: callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 - note E_, 4 - note E_, 4 - note E_, 2 - note E_, 6 + E_ 4 + E_ 4 + E_ 2 + E_ 6 loopchannel 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: - note E_, 2 - note E_, 6 - note F#, 2 - note F#, 6 + E_ 2 + E_ 6 + F# 2 + F# 6 endchannel Music_MuseumGuy_branch_adec:: - note E_, 2 - note E_, 6 - note D_, 2 - note D_, 6 + E_ 2 + E_ 6 + D_ 2 + D_ 6 endchannel @@ -58,110 +58,110 @@ Music_MuseumGuy_Ch2:: ; adf1 (2:6df1) duty 2 notetype 12, 12, 1 octave 4 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 + E_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 4 - note E_, 1 - note G#, 1 - note B_, 1 + B_ 2 + A_ 2 + G# 2 + E_ 4 + E_ 1 + G# 1 + B_ 1 octave 4 - note D#, 1 - note E_, 8 + D# 1 + E_ 8 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note F#, 2 - note A_, 4 + C# 2 + E_ 4 + D_ 2 + F# 2 + A_ 4 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note C#, 2 + C# 2 + E_ 4 + D_ 2 + C# 2 octave 3 - note B_, 4 - note A_, 2 + B_ 4 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note F#, 2 - note A_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note A_, 4 + C# 2 + E_ 4 + D_ 2 + F# 2 + A_ 2 + A_ 2 + G# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + A_ 2 + A_ 4 Music_MuseumGuy_branch_ae26:: octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 3 + C# 2 + E_ 3 notetype 12, 8, 1 - note E_, 1 + E_ 1 notetype 12, 12, 1 - note D_, 2 - note F#, 2 - note A_, 3 + D_ 2 + F# 2 + A_ 3 notetype 12, 9, 1 - note A_, 1 + A_ 1 notetype 12, 12, 1 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 4 - note D_, 1 - note C#, 1 - note C_, 1 + C# 2 + E_ 4 + D_ 1 + C# 1 + C_ 1 octave 3 - note B_, 1 - note B_, 3 + B_ 1 + B_ 3 notetype 12, 10, 1 - note G#, 1 + G# 1 notetype 12, 12, 1 - note A_, 2 + A_ 2 octave 4 - note C#, 2 - note E_, 3 + C# 2 + E_ 3 notetype 12, 9, 1 - note E_, 1 + E_ 1 notetype 12, 12, 1 - note D_, 2 - note F#, 2 - note A_, 3 + D_ 2 + F# 2 + A_ 3 notetype 12, 8, 1 - note A_, 1 + A_ 1 notetype 12, 12, 1 - note G#, 2 - note E_, 1 + G# 2 + E_ 1 notetype 12, 8, 1 - note E_, 1 + E_ 1 notetype 12, 12, 1 - note F#, 2 + F# 2 notetype 12, 8, 1 - note F#, 1 + F# 1 notetype 12, 12, 1 - note G#, 1 - note A_, 2 - note A_, 2 - note A_, 4 + G# 1 + A_ 2 + A_ 2 + A_ 4 loopchannel 0, Music_MuseumGuy_branch_ae26 @@ -169,95 +169,95 @@ Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e) notetype 12, 1, 0 rest 16 octave 4 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 9 callchannel Music_MuseumGuy_branch_aeb8 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 5 - note G#, 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 5 callchannel Music_MuseumGuy_branch_aeb8 - note B_, 1 + B_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 Music_MuseumGuy_branch_ae8e:: callchannel Music_MuseumGuy_branch_aec1 rest 3 octave 6 - note E_, 1 + E_ 1 rest 1 octave 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 callchannel Music_MuseumGuy_branch_aec1 rest 1 octave 6 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 loopchannel 0, Music_MuseumGuy_branch_ae8e Music_MuseumGuy_branch_aeb8:: - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 5 endchannel Music_MuseumGuy_branch_aec1:: octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 octave 6 - note F#, 1 + F# 1 rest 1 octave 5 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 endchannel @@ -270,69 +270,69 @@ Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1) rest 16 rest 14 dspeed 6 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 Music_MuseumGuy_branch_aee1:: - dnote 4, mutedsnare2 - dnote 6, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 6, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 6, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 6, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 2, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 6, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 4 + mutedsnare2 6 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 6 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare2 6 + mutedsnare2 2 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 6 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 2 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 6 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 loopchannel 0, Music_MuseumGuy_branch_aee1 -; 0xaf59
\ No newline at end of file +; 0xaf59 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index f7302471..51c6cbf6 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,71 +1,71 @@ Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9) - tempo 0, 140 - stereopanning 119 + tempo 140 + volume 7, 7 duty 3 vibrato 16, 1, 2 - togglecall + toggleperfectpitch notetype 12, 11, 3 octave 2 - note B_, 1 + B_ 1 octave 3 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note B_, 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + G# 1 + A_ 1 + B_ 1 Music_OaksLab_branch_7eed0:: octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 4 - note G#, 2 - note A_, 2 - note B_, 1 + A_ 4 + G# 2 + A_ 2 + B_ 1 rest 3 - note A_, 6 - note G#, 1 - note B_, 1 + A_ 6 + G# 1 + B_ 1 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 4 - note G#, 2 - note A_, 2 - note F#, 4 - note E_, 2 - note F#, 2 - note G#, 1 + A_ 4 + G# 2 + A_ 2 + F# 4 + E_ 2 + F# 2 + G# 1 rest 3 - note F#, 8 - note E_, 4 - note A_, 6 - note E_, 1 - note A_, 1 + F# 8 + E_ 4 + A_ 6 + E_ 1 + A_ 1 octave 4 - note D_, 8 - note C#, 6 + D_ 8 + C# 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note C#, 1 - note E_, 8 - note D_, 4 - note C#, 4 + C# 1 + E_ 8 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note G#, 1 + B_ 4 + A_ 4 + G# 1 rest 3 - note E_, 4 - note F#, 4 - note G#, 4 + E_ 4 + F# 4 + G# 4 loopchannel 0, Music_OaksLab_branch_7eed0 @@ -74,72 +74,72 @@ Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05) vibrato 10, 2, 5 notetype 12, 12, 4 octave 3 - note G#, 1 - note A_, 1 - note B_, 1 + G# 1 + A_ 1 + B_ 1 octave 4 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note G#, 1 + C# 1 + D_ 1 + E_ 1 + F# 1 + G# 1 Music_OaksLab_branch_7ef16:: - note A_, 6 - note G#, 1 - note F#, 1 - note E_, 6 - note D#, 1 - note E_, 1 - note F#, 1 + A_ 6 + G# 1 + F# 1 + E_ 6 + D# 1 + E_ 1 + F# 1 rest 3 - note E_, 8 - note E_, 4 - note F#, 6 - note E_, 1 - note D_, 1 - note C#, 6 + E_ 8 + E_ 4 + F# 6 + E_ 1 + D_ 1 + C# 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 - note D_, 1 + C# 1 + D_ 1 rest 3 - note C#, 8 - note C#, 4 - note D_, 6 + C# 8 + C# 4 + D_ 6 octave 3 - note A_, 1 + A_ 1 octave 4 - note D_, 1 - note F#, 8 - note E_, 6 - note C#, 1 - note E_, 1 - note A_, 8 - note G#, 4 - note A_, 2 - note G#, 2 - note F#, 4 - note G#, 2 - note F#, 2 - note E_, 1 + D_ 1 + F# 8 + E_ 6 + C# 1 + E_ 1 + A_ 8 + G# 4 + A_ 2 + G# 2 + F# 4 + G# 2 + F# 2 + E_ 1 rest 1 octave 3 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 loopchannel 0, Music_OaksLab_branch_7ef16 @@ -148,247 +148,247 @@ Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52) notetype 12, 1, 1 rest 2 octave 4 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 Music_OaksLab_branch_7ef5c:: - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 5 - note G#, 1 + G# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 3 - note A_, 1 + A_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note C#, 1 + C# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note E_, 1 + E_ 1 rest 3 loopchannel 0, Music_OaksLab_branch_7ef5c -; 0x7f04a
\ No newline at end of file +; 0x7f04a diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 15162c3a..71be9eb1 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,149 +1,149 @@ Music_PalletTown_Ch1:: ; a7c5 (2:67c5) - tempo 0, 160 - stereopanning 119 + tempo 160 + volume 7, 7 duty 2 notetype 12, 12, 3 Music_PalletTown_branch_a7ce:: octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 2 - note D_, 4 - note G_, 2 - note D_, 2 - note C_, 2 + C_ 2 + D_ 4 + G_ 2 + D_ 2 + C_ 2 octave 3 - note B_, 4 - note G_, 2 + B_ 4 + G_ 2 octave 4 - note D_, 4 - note D_, 2 - note C_, 2 + D_ 4 + D_ 2 + C_ 2 octave 3 - note B_, 2 + B_ 2 rest 2 - note B_, 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 8 + C_ 8 rest 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note F#, 2 - note B_, 4 + A_ 2 + B_ 2 + G_ 2 + A_ 2 + F# 2 + B_ 4 octave 4 - note C_, 2 - note D_, 4 - note G_, 2 - note D_, 2 - note C_, 2 + C_ 2 + D_ 4 + G_ 2 + D_ 2 + C_ 2 octave 3 - note B_, 4 - note G_, 2 + B_ 4 + G_ 2 octave 4 - note D_, 4 - note D_, 2 - note G_, 2 - note F#, 2 - note E_, 4 - note D_, 2 - note C_, 4 + D_ 4 + D_ 2 + G_ 2 + F# 2 + E_ 4 + D_ 2 + C_ 4 octave 3 - note A_, 2 - note B_, 2 + A_ 2 + B_ 2 octave 4 - note C_, 2 - note D_, 2 - note C_, 2 + C_ 2 + D_ 2 + C_ 2 octave 3 - note B_, 2 - note A_, 2 - note G_, 4 - note F#, 4 + B_ 2 + A_ 2 + G_ 4 + F# 4 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note E_, 2 - note G_, 2 + G_ 2 + E_ 2 + G_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 - note F#, 2 - note A_, 2 + A_ 2 + F# 2 + A_ 2 notetype 12, 11, 3 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note E_, 2 - note G_, 2 + G_ 2 + E_ 2 + G_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - note C_, 2 - note D_, 2 + A_ 2 + F# 2 + A_ 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 + B_ 2 + G_ 2 + D_ 2 + G_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + A_ 2 + E_ 2 + C_ 2 + E_ 2 + F# 2 + D_ 2 + C_ 2 + D_ 2 + G_ 2 + E_ 2 + C_ 2 + E_ 2 + G_ 2 + E_ 2 + C_ 2 + E_ 2 + F# 2 + D_ 2 + C_ 2 + D_ 2 loopchannel 0, Music_PalletTown_branch_a7ce endchannel @@ -154,110 +154,110 @@ Music_PalletTown_Ch2:: ; a85f (2:685f) Music_PalletTown_branch_a861:: notetype 12, 13, 3 octave 5 - note D_, 2 + D_ 2 notetype 12, 10, 3 - note C_, 2 + C_ 2 notetype 12, 13, 3 octave 4 - note B_, 2 + B_ 2 notetype 12, 11, 3 - note A_, 2 + A_ 2 notetype 12, 13, 3 octave 5 - note G_, 2 + G_ 2 notetype 12, 11, 3 - note E_, 2 + E_ 2 notetype 12, 13, 3 - note F#, 2 - note E_, 2 - note D_, 6 + F# 2 + E_ 2 + D_ 6 octave 4 - note B_, 2 - note G_, 2 - note G_, 2 - note A_, 2 - note B_, 2 + B_ 2 + G_ 2 + G_ 2 + A_ 2 + B_ 2 octave 5 - note C_, 10 + C_ 10 octave 4 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 6 + F# 2 + G_ 2 + A_ 2 + B_ 6 octave 5 - note C_, 1 + C_ 1 octave 4 - note B_, 1 - note A_, 8 + B_ 1 + A_ 8 octave 5 - note D_, 2 + D_ 2 notetype 12, 10, 3 - note C_, 2 + C_ 2 notetype 12, 13, 3 octave 4 - note B_, 2 + B_ 2 notetype 12, 11, 3 octave 5 - note D_, 2 + D_ 2 notetype 12, 13, 3 - note G_, 2 + G_ 2 notetype 12, 10, 3 - note F#, 2 + F# 2 notetype 12, 11, 3 - note F#, 2 + F# 2 notetype 12, 13, 3 - note G_, 2 - note E_, 6 - note D_, 2 - note D_, 8 - note C_, 2 + G_ 2 + E_ 6 + D_ 2 + D_ 8 + C_ 2 octave 4 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 octave 5 - note D_, 2 - note C_, 2 + D_ 2 + C_ 2 octave 4 - note B_, 2 - note A_, 2 - note G_, 10 - note G_, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + G_ 10 + G_ 2 + A_ 2 + B_ 2 octave 5 - note C_, 8 - note D_, 6 - note C_, 2 + C_ 8 + D_ 6 + C_ 2 octave 4 - note B_, 8 + B_ 8 rest 2 - note G_, 2 - note A_, 2 - note B_, 2 + G_ 2 + A_ 2 + B_ 2 octave 5 - note C_, 4 - note C_, 4 - note D_, 6 - note C_, 1 - note D_, 1 + C_ 4 + C_ 4 + D_ 6 + C_ 1 + D_ 1 octave 4 - note B_, 8 + B_ 8 rest 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 8 - note E_, 4 - note B_, 4 - note A_, 8 - note G_, 4 - note E_, 4 - note F#, 8 - note G_, 4 - note B_, 4 - note B_, 8 - note A_, 8 + B_ 2 + A_ 2 + G_ 2 + A_ 8 + E_ 4 + B_ 4 + A_ 8 + G_ 4 + E_ 4 + F# 8 + G_ 4 + B_ 4 + B_ 8 + A_ 8 loopchannel 0, Music_PalletTown_branch_a861 endchannel @@ -268,48 +268,48 @@ Music_PalletTown_Ch3:: ; a8de (2:68de) Music_PalletTown_branch_a8e3:: octave 4 - note G_, 6 - note E_, 6 - note F#, 4 - note G_, 6 - note A_, 6 - note G_, 4 - note E_, 6 - note F#, 6 - note E_, 4 - note G_, 6 - note E_, 6 - note D_, 4 - note G_, 6 - note E_, 6 - note F#, 4 - note G_, 6 - note A_, 6 - note G_, 4 - note E_, 6 - note F#, 6 - note A_, 4 - note G_, 6 - note E_, 6 - note D_, 4 - note C_, 8 - note D_, 8 - note G_, 8 - note E_, 4 - note D_, 4 - note C_, 8 - note D_, 8 - note G_, 8 - note A_, 4 - note G_, 4 - note E_, 8 - note A_, 8 - note E_, 8 - note G_, 8 - note F#, 8 - note E_, 8 - note E_, 8 - note F#, 8 + G_ 6 + E_ 6 + F# 4 + G_ 6 + A_ 6 + G_ 4 + E_ 6 + F# 6 + E_ 4 + G_ 6 + E_ 6 + D_ 4 + G_ 6 + E_ 6 + F# 4 + G_ 6 + A_ 6 + G_ 4 + E_ 6 + F# 6 + A_ 4 + G_ 6 + E_ 6 + D_ 4 + C_ 8 + D_ 8 + G_ 8 + E_ 4 + D_ 4 + C_ 8 + D_ 8 + G_ 8 + A_ 4 + G_ 4 + E_ 8 + A_ 8 + E_ 8 + G_ 8 + F# 8 + E_ 8 + E_ 8 + F# 8 loopchannel 0, Music_PalletTown_branch_a8e3 endchannel -; 0xa913
\ No newline at end of file +; 0xa913 diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 9a16b435..24247326 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,21 +1,21 @@ Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 12, 8, 1 rest 2 pitchbend 0, 75 - note B_, 2 + B_ 2 pitchbend 0, 84 - note B_, 2 + B_ 2 pitchbend 0, 68 - note E_, 2 + E_ 2 rest 4 pitchbend 0, 59 - note E_, 4 + E_ 4 pitchbend 0, 75 - note B_, 4 + B_ 4 endchannel @@ -23,26 +23,26 @@ Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4) duty 2 notetype 12, 12, 3 octave 4 - note B_, 4 - note B_, 4 - note B_, 2 - note G#, 2 + B_ 4 + B_ 4 + B_ 2 + G# 2 notetype 12, 12, 4 octave 5 - note E_, 8 + E_ 8 endchannel Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2) notetype 12, 1, 0 octave 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note E_, 2 - note G#, 2 - note E_, 6 + E_ 2 + G# 2 + E_ 6 rest 2 endchannel -; 0x9bde
\ No newline at end of file +; 0x9bde diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 4e139b9a..de6e0873 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,151 +1,151 @@ Music_Pokecenter_Ch1:: ; be56 (2:7e56) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 duty 3 vibrato 10, 2, 2 - togglecall + toggleperfectpitch Music_Pokecenter_branch_be61:: notetype 12, 10, 3 octave 3 - note F#, 2 - note F_, 2 - note F#, 2 + F# 2 + F_ 2 + F# 2 notetype 12, 11, 5 octave 4 - note D_, 4 - note C#, 2 + D_ 4 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + B_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 notetype 12, 10, 3 - note A_, 2 - note E_, 2 - note A_, 2 + A_ 2 + E_ 2 + A_ 2 notetype 12, 11, 5 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note C#, 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 notetype 12, 10, 3 - note F#, 2 - note F_, 2 - note F#, 2 + F# 2 + F_ 2 + F# 2 notetype 12, 11, 5 octave 4 - note D_, 4 - note C#, 2 + D_ 4 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 + B_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 notetype 12, 10, 3 - note A_, 2 - note E_, 2 - note A_, 2 + A_ 2 + E_ 2 + A_ 2 notetype 12, 11, 5 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note F#, 2 - note E_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 8 + B_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + F# 2 + E_ 2 + D_ 4 + E_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 4 + E_ 2 + F# 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 4 + C# 2 + D_ 2 + E_ 2 + G_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + A_ 8 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 4 - note A_, 2 - note B_, 2 + B_ 4 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 4 + C# 2 + D_ 2 + E_ 2 + D_ 2 + C# 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 2 + C# 2 + D_ 2 + E_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 4 - note G_, 2 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 + B_ 2 + A_ 4 + G_ 2 + A_ 2 + B_ 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + F# 2 + G_ 2 loopchannel 0, Music_Pokecenter_branch_be61 @@ -157,94 +157,94 @@ Music_Pokecenter_branch_befc:: duty 3 notetype 12, 10, 5 octave 3 - note A_, 4 - note E_, 4 + A_ 4 + E_ 4 callchannel Music_Pokecenter_branch_bf60 - note D_, 2 - note F#, 6 + D_ 2 + F# 6 duty 3 notetype 12, 10, 5 octave 3 - note A_, 4 - note E_, 4 + A_ 4 + E_ 4 callchannel Music_Pokecenter_branch_bf4e duty 3 notetype 12, 10, 5 octave 3 - note A_, 4 - note E_, 4 + A_ 4 + E_ 4 callchannel Music_Pokecenter_branch_bf60 - note D_, 8 + D_ 8 duty 3 notetype 12, 10, 5 octave 3 - note D_, 4 - note E_, 4 + D_ 4 + E_ 4 duty 2 notetype 12, 12, 6 octave 4 - note F#, 8 - note A_, 8 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 8 - note C#, 8 - note E_, 8 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 8 - note F#, 8 - note A_, 8 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 8 - note A_, 4 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 8 + F# 8 + A_ 8 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 8 + C# 8 + E_ 8 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 8 + F# 8 + A_ 8 + G_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 8 + A_ 4 + G_ 2 + F# 2 + G_ 8 + F# 2 + G_ 2 + F# 2 + E_ 2 + D_ 8 loopchannel 0, Music_Pokecenter_branch_befc Music_Pokecenter_branch_bf4e:: duty 2 notetype 12, 12, 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 notetype 12, 12, 3 - note A_, 4 - note G_, 4 - note F#, 2 - note E_, 2 - note C#, 6 + A_ 4 + G_ 4 + F# 2 + E_ 2 + C# 6 endchannel Music_Pokecenter_branch_bf60:: duty 2 notetype 12, 12, 2 octave 4 - note C#, 2 + C# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 + C# 2 notetype 12, 12, 3 - note F#, 4 - note E_, 4 - note C#, 2 + F# 4 + E_ 4 + C# 2 endchannel @@ -253,124 +253,124 @@ Music_Pokecenter_Ch3:: ; bf70 (2:7f70) Music_Pokecenter_branch_bf72:: octave 4 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note G_, 2 - note F#, 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + G_ 2 + F# 2 callchannel Music_Pokecenter_branch_bfd9 callchannel Music_Pokecenter_branch_bfe2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note G_, 2 - note F#, 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + G_ 2 + A_ 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + G_ 2 + F# 2 callchannel Music_Pokecenter_branch_bfd9 callchannel Music_Pokecenter_branch_bfe2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note B_, 2 - note A_, 2 - note G_, 2 + D_ 2 + F# 2 + D_ 2 + F# 2 + D_ 2 + B_ 2 + A_ 2 + G_ 2 callchannel Music_Pokecenter_branch_bfeb - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note A_, 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + G# 2 + A_ 2 callchannel Music_Pokecenter_branch_bfeb - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + G_ 2 + B_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + E_ 2 + G_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + G_ 2 + F# 2 + E_ 2 loopchannel 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 endchannel Music_Pokecenter_branch_bfe2:: - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note G_, 2 - note A_, 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + G_ 2 + A_ 2 endchannel Music_Pokecenter_branch_bfeb:: - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + A_ 2 endchannel -; 0xbff4
\ No newline at end of file +; 0xbff4 diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index 915c656d..e04dcb30 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,142 +1,142 @@ Music_PokemonTower_Ch1:: ; 7f04a (1f:704a) - tempo 0, 152 - stereopanning 119 + tempo 152 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch vibrato 12, 2, 3 notetype 12, 8, 0 rest 4 octave 4 - note B_, 12 + B_ 12 Music_PokemonTower_branch_7f05a:: notetype 12, 11, 4 octave 4 - note G_, 1 + G_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 octave 3 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 4 - note F#, 1 + F# 1 rest 7 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note G_, 1 + B_ 1 + G_ 1 rest 5 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note F#, 1 + F# 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note D_, 1 + D_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 4 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C#, 1 + C# 1 rest 7 - note C#, 1 + C# 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 3 notetype 12, 8, 4 - note C_, 1 + C_ 1 rest 3 notetype 12, 11, 4 - note D_, 1 + D_ 1 rest 7 - note D_, 1 + D_ 1 rest 7 octave 3 - note A_, 1 + A_ 1 rest 7 - note A_, 1 + A_ 1 rest 7 notetype 12, 10, 7 - note B_, 8 - note B_, 8 + B_ 8 + B_ 8 octave 4 - note C_, 8 - note C_, 8 - note C#, 8 - note C#, 8 + C_ 8 + C_ 8 + C# 8 + C# 8 notetype 12, 10, 6 - note D_, 16 + D_ 16 rest 16 rest 16 rest 16 rest 16 notetype 12, 9, 2 - note B_, 4 + B_ 4 octave 5 - note E_, 4 - note D_, 4 - note C_, 4 + E_ 4 + D_ 4 + C_ 4 octave 4 - note B_, 4 + B_ 4 octave 5 - note E_, 4 - note D_, 4 - note C_, 4 + E_ 4 + D_ 4 + C_ 4 octave 4 - note B_, 4 + B_ 4 octave 5 - note E_, 4 - note D_, 4 - note C_, 4 + E_ 4 + D_ 4 + C_ 4 octave 4 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 + B_ 4 + G_ 4 + F# 4 + E_ 4 octave 5 - note C_, 16 - note C_, 16 + C_ 16 + C_ 16 loopchannel 0, Music_PokemonTower_branch_7f05a @@ -145,150 +145,150 @@ Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3) duty 3 notetype 12, 10, 0 octave 5 - note C_, 12 + C_ 12 octave 4 - note E_, 4 + E_ 4 Music_PokemonTower_branch_7f0ee:: notetype 12, 12, 1 octave 5 - note C_, 8 + C_ 8 octave 4 - note B_, 4 + B_ 4 notetype 12, 12, 4 - note G_, 1 - note F#, 1 - note E_, 1 - note D#, 1 + G_ 1 + F# 1 + E_ 1 + D# 1 notetype 12, 11, 0 - note G_, 8 + G_ 8 octave 5 - note C_, 8 + C_ 8 octave 4 - note B_, 4 - note G_, 4 - note E_, 4 - note G_, 4 + B_ 4 + G_ 4 + E_ 4 + G_ 4 octave 5 - note C_, 8 + C_ 8 notetype 12, 11, 7 - note C_, 8 + C_ 8 notetype 12, 12, 2 octave 4 - note G_, 1 - note F#, 1 - note E_, 1 + G_ 1 + F# 1 + E_ 1 rest 1 notetype 12, 9, 6 octave 3 - note G_, 4 + G_ 4 notetype 12, 12, 7 - note G_, 4 - note B_, 4 - note G_, 4 - note B_, 4 + G_ 4 + B_ 4 + G_ 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 notetype 12, 11, 0 octave 4 - note C_, 16 - note E_, 8 + C_ 16 + E_ 8 notetype 12, 11, 7 - note E_, 12 + E_ 12 notetype 12, 12, 5 octave 5 - note C_, 4 + C_ 4 octave 4 - note B_, 4 - note G_, 4 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 + B_ 4 + G_ 4 + B_ 4 + G_ 4 + F# 4 + E_ 4 notetype 12, 11, 0 - note F#, 12 - note G_, 4 + F# 12 + G_ 4 notetype 12, 11, 0 - note F#, 8 + F# 8 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 11, 0 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 16 + B_ 4 + G_ 4 + F# 4 + E_ 4 + B_ 16 notetype 12, 11, 0 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 4 - note F#, 4 - note E_, 4 + G_ 4 + F# 4 + E_ 4 notetype 12, 9, 0 octave 5 - note C_, 16 + C_ 16 notetype 12, 11, 0 - note D_, 4 + D_ 4 octave 4 - note A_, 4 - note G#, 4 - note F#, 4 + A_ 4 + G# 4 + F# 4 notetype 12, 2, 15 octave 5 - note D_, 16 + D_ 16 notetype 12, 12, 0 - note E_, 4 + E_ 4 octave 4 - note B_, 4 - note A_, 4 - note G_, 4 + B_ 4 + A_ 4 + G_ 4 octave 5 - note F_, 4 - note C_, 4 + F_ 4 + C_ 4 octave 4 - note A#, 4 - note G#, 4 + A# 4 + G# 4 octave 5 - note F#, 4 - note D_, 4 - note C_, 4 + F# 4 + D_ 4 + C_ 4 octave 4 - note A#, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note D_, 4 + A# 4 + G# 4 + F# 4 + E_ 4 + D_ 4 notetype 12, 11, 0 - note C_, 8 + C_ 8 notetype 12, 9, 0 - note C_, 8 + C_ 8 notetype 12, 8, 0 - note C_, 8 + C_ 8 notetype 12, 7, 0 - note C_, 8 + C_ 8 notetype 12, 6, 0 - note C_, 8 + C_ 8 notetype 12, 6, 7 - note C_, 8 + C_ 8 rest 16 notetype 12, 10, 0 octave 5 - note G_, 16 + G_ 16 octave 6 - note C_, 16 + C_ 16 octave 5 - note B_, 8 - note G_, 8 - note E_, 8 - note G_, 8 + B_ 8 + G_ 8 + E_ 8 + G_ 8 octave 6 - note C_, 16 + C_ 16 vibrato 0, 3, 4 notetype 12, 10, 7 - note C_, 16 + C_ 16 loopchannel 0, Music_PokemonTower_branch_7f0ee @@ -297,163 +297,163 @@ Music_PokemonTower_Ch3:: ; 7f19a (1f:719a) notetype 12, 1, 3 rest 8 octave 5 - note G_, 8 + G_ 8 Music_PokemonTower_branch_7f1a2:: - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note E_, 1 + E_ 1 + D# 1 + F# 1 + D# 1 + E_ 1 rest 7 - note G_, 1 + G_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note E_, 1 - note D#, 1 + E_ 1 + D# 1 octave 4 - note B_, 1 + B_ 1 rest 5 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 5 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 octave 4 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 - note B_, 1 + B_ 1 rest 7 octave 5 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note C_, 1 + C_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 7 - note F#, 1 + F# 1 rest 7 - note D_, 1 + D_ 1 rest 7 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 7 - note E_, 1 + E_ 1 rest 7 - note F_, 1 + F_ 1 rest 7 - note F_, 1 + F_ 1 rest 7 - note F#, 1 + F# 1 rest 7 - note F#, 1 + F# 1 rest 7 - note G_, 1 + G_ 1 rest 15 notetype 12, 1, 5 octave 4 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 15 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 7 notetype 12, 1, 3 octave 6 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 15 - note E_, 1 + E_ 1 rest 7 octave 5 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_PokemonTower_branch_7f1a2 -; 0x7f243
\ No newline at end of file +; 0x7f243 diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index a5c1b40d..9876b0ea 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -1,107 +1,107 @@ Music_Routes1_Ch1:: ; 9bde (2:5bde) - tempo 0, 152 - stereopanning 119 + tempo 152 + volume 7, 7 vibrato 4, 2, 3 duty 2 - togglecall + toggleperfectpitch Music_Routes1_branch_9be9:: notetype 12, 10, 1 rest 4 octave 4 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 1 - note C#, 1 + D_ 2 + D_ 6 + D_ 2 + D_ 6 + D_ 2 + D_ 1 + C# 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 + C# 1 octave 3 - note A_, 2 - note A_, 2 - note A_, 6 - octave 4 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 + A_ 2 + A_ 2 + A_ 6 + octave 4 + C# 2 + C# 6 + C# 2 + C# 4 octave 3 - note A_, 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 2 - note A_, 6 - octave 4 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 1 - note E_, 1 - note D_, 1 - note C#, 1 + A_ 2 + A_ 6 + octave 4 + D_ 2 + D_ 6 + D_ 2 + D_ 6 + D_ 2 + D_ 1 + E_ 1 + D_ 1 + C# 1 octave 3 - note B_, 2 - note A_, 2 - note A_, 6 + B_ 2 + A_ 2 + A_ 6 octave 4 - note C#, 2 - note C#, 6 + C# 2 + C# 6 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 notetype 12, 10, 2 octave 4 - note G_, 4 - note E_, 4 - note F#, 2 + G_ 4 + E_ 4 + F# 2 notetype 12, 10, 1 octave 3 - note A_, 2 - note A_, 6 - note A_, 2 - note F#, 2 - note A_, 4 - note B_, 2 - octave 4 - note C#, 2 + A_ 2 + A_ 6 + A_ 2 + F# 2 + A_ 4 + B_ 2 + octave 4 + C# 2 octave 3 - note B_, 4 - note A_, 2 - note F#, 2 - note A_, 4 - note G_, 2 - note E_, 2 - note C#, 4 - note A_, 2 - octave 4 - note D_, 2 + B_ 4 + A_ 2 + F# 2 + A_ 4 + G_ 2 + E_ 2 + C# 4 + A_ 2 + octave 4 + D_ 2 octave 3 - note A_, 4 - note B_, 2 - note G_, 2 - note B_, 4 - octave 4 - note D_, 2 - note E_, 2 - note C#, 2 - note D_, 2 + A_ 4 + B_ 2 + G_ 2 + B_ 4 + octave 4 + D_ 2 + E_ 2 + C# 2 + D_ 2 octave 3 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 loopchannel 0, Music_Routes1_branch_9be9 endchannel @@ -119,117 +119,117 @@ Music_Routes1_branch_9c53:: Music_Routes1_branch_9c65:: octave 4 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note G_, 3 - note F#, 1 - note E_, 6 + D_ 1 + E_ 1 + F# 2 + F# 2 + F# 2 + D_ 1 + E_ 1 + F# 2 + F# 2 + F# 2 + D_ 1 + E_ 1 + F# 2 + F# 2 + G_ 3 + F# 1 + E_ 6 endchannel Music_Routes1_branch_9c78:: - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note F#, 1 - note E_, 1 - note E_, 1 - note F#, 1 - note D_, 4 - note F#, 2 + C# 1 + D_ 1 + E_ 2 + E_ 2 + E_ 2 + C# 1 + D_ 1 + E_ 2 + E_ 2 + E_ 2 + C# 1 + D_ 1 + E_ 2 + E_ 2 + F# 1 + E_ 1 + E_ 1 + F# 1 + D_ 4 + F# 2 endchannel Music_Routes1_branch_9c8d:: - note C#, 1 - note D_, 1 - note E_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 2 + C# 1 + D_ 1 + E_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 + C# 2 notetype 12, 13, 2 - note B_, 4 + B_ 4 notetype 6, 13, 1 octave 3 - note B_, 1 + B_ 1 octave 4 - note C#, 1 + C# 1 notetype 12, 13, 1 octave 3 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 octave 4 - note C#, 1 - note D_, 6 + C# 1 + D_ 6 notetype 12, 13, 2 - note F#, 1 - note G_, 1 - note A_, 2 - note A_, 2 - note F#, 2 - note D_, 2 + F# 1 + G_ 1 + A_ 2 + A_ 2 + F# 2 + D_ 2 octave 5 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 2 - octave 4 - note A_, 2 - note F#, 2 - note D_, 3 - note F#, 1 - note E_, 6 - note F#, 1 - note G_, 1 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 + C# 2 + octave 4 + A_ 2 + F# 2 + D_ 3 + F# 1 + E_ 6 + F# 1 + G_ 1 + A_ 2 + A_ 2 + F# 2 + A_ 2 octave 5 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 4 - note B_, 3 - note G_, 1 - note A_, 2 + B_ 3 + G_ 1 + A_ 2 octave 5 - note D_, 2 - note C#, 2 - note E_, 2 - note D_, 2 + D_ 2 + C# 2 + E_ 2 + D_ 2 notetype 12, 13, 1 octave 4 - note D_, 2 - note D_, 2 + D_ 2 + D_ 2 endchannel endchannel @@ -241,70 +241,70 @@ Music_Routes1_Ch3:: ; 9cd8 (2:5cd8) Music_Routes1_branch_9cdd:: rest 2 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 - note B_, 4 - note A_, 4 + A_ 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C_, 4 - note C#, 4 + C_ 4 + C# 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 - note B_, 4 - note A_, 4 + A_ 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note B_, 4 + B_ 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 4 + D_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note D_, 8 + D_ 8 octave 3 - note G_, 8 - note A_, 8 + G_ 8 + A_ 8 octave 4 - note C#, 8 - note D_, 8 + C# 8 + D_ 8 octave 3 - note G_, 8 - note A_, 8 + G_ 8 + A_ 8 octave 4 - note D_, 6 + D_ 6 loopchannel 0, Music_Routes1_branch_9cdd endchannel @@ -312,94 +312,94 @@ Music_Routes1_branch_9cdd:: Music_Routes1_Ch4:: ; 9d24 (2:5d24) dspeed 12 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 rest 4 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 + mutedsnare1 2 rest 2 - dnote 2, mutedsnare1 - dnote 2, mutedsnare1 + mutedsnare1 2 + mutedsnare1 2 loopchannel 0, Music_Routes1_Ch4 endchannel -; 0x9db9
\ No newline at end of file +; 0x9db9 diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index a1362569..9ba376ce 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -1,143 +1,143 @@ Music_Routes2_Ch1:: ; 9db9 (2:5db9) - tempo 0, 152 - stereopanning 119 + tempo 152 + volume 7, 7 vibrato 9, 2, 5 duty 1 Music_Routes2_branch_9dc3:: notetype 12, 11, 2 octave 2 - note B_, 4 - octave 3 - note G#, 6 - note F#, 2 - note E_, 2 - note D#, 1 - note F#, 1 - note E_, 2 + B_ 4 + octave 3 + G# 6 + F# 2 + E_ 2 + D# 1 + F# 1 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note A_, 2 - note G#, 4 - note F#, 4 + E_ 2 + A_ 2 + G# 4 + F# 4 octave 2 - note B_, 4 - octave 3 - note G#, 6 - note F#, 2 - note E_, 2 - note D#, 1 - note F#, 1 - note B_, 2 + B_ 4 + octave 3 + G# 6 + F# 2 + E_ 2 + D# 1 + F# 1 + B_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 - note A_, 2 - note G#, 4 - note B_, 4 + E_ 2 + A_ 2 + G# 4 + B_ 4 notetype 8, 11, 2 octave 4 - note E_, 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note E_, 2 - note D#, 2 + E_ 2 + D# 2 octave 3 - note G#, 2 + G# 2 octave 4 - note D#, 2 - note D#, 2 + D# 2 + D# 2 octave 3 - note G#, 2 + G# 2 octave 4 - note D#, 2 - note C#, 2 + D# 2 + C# 2 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 2 - note C#, 2 + C# 2 + C# 2 octave 3 - note F#, 2 + F# 2 octave 4 - note C#, 2 - octave 3 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 + C# 2 + octave 3 + B_ 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + A_ 2 + F# 2 + A_ 2 + F# 2 + G# 2 + A_ 2 + A_ 2 + F# 2 + A_ 2 + G# 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + B_ 2 + E_ 2 + B_ 2 + A_ 2 + B_ 2 + A_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 + C# 2 + D_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note D_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 + D_ 2 + F# 2 + E_ 2 + D# 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note E_, 2 + E_ 2 loopchannel 0, Music_Routes2_branch_9dc3 endchannel @@ -149,68 +149,68 @@ Music_Routes2_Ch2:: ; 9e4f (2:5e4f) Music_Routes2_branch_9e54:: notetype 12, 13, 4 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note E_, 1 - note F#, 6 - note A_, 2 - note G#, 3 - note E_, 1 - note F#, 8 - octave 3 - note D#, 4 + E_ 1 + F# 6 + A_ 2 + G# 3 + E_ 1 + F# 8 + octave 3 + D# 4 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 1 + B_ 1 octave 4 - note E_, 1 - note F#, 6 - note A_, 2 - note G#, 3 - note E_, 1 - note B_, 8 - octave 3 - note G#, 4 + E_ 1 + F# 6 + A_ 2 + G# 3 + E_ 1 + B_ 8 + octave 3 + G# 4 octave 5 - note C#, 6 + C# 6 octave 4 - note B_, 1 - note A_, 1 - note B_, 6 - note A_, 1 - note G#, 1 - note A_, 6 - note G#, 1 - note F#, 1 - note G#, 4 - note F#, 2 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 8 - note A_, 4 - note G#, 3 - note F#, 1 - note E_, 8 - note F#, 2 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 4 + B_ 1 + A_ 1 + B_ 6 + A_ 1 + G# 1 + A_ 6 + G# 1 + F# 1 + G# 4 + F# 2 + E_ 2 + D_ 2 + D_ 1 + E_ 1 + F# 8 + A_ 4 + G# 3 + F# 1 + E_ 8 + F# 2 + E_ 2 + D_ 2 + D_ 1 + E_ 1 + F# 2 + F# 1 + G# 1 + A_ 4 octave 5 - note C#, 4 + C# 4 octave 4 - note B_, 3 - note A_, 1 - note G#, 8 + B_ 3 + A_ 1 + G# 8 rest 4 loopchannel 0, Music_Routes2_branch_9e54 endchannel @@ -222,103 +222,103 @@ Music_Routes2_Ch3:: ; 9e9b (2:5e9b) Music_Routes2_branch_9e9e:: notetype 12, 1, 1 octave 3 - note E_, 2 + E_ 2 rest 2 octave 2 - note B_, 6 + B_ 6 octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - note D#, 2 - note E_, 2 + D_ 1 + C# 1 + D_ 2 + D# 2 + E_ 2 rest 2 octave 2 - note B_, 6 + B_ 6 octave 3 - note D_, 1 - note C#, 1 + D_ 1 + C# 1 octave 2 - note A_, 2 + A_ 2 octave 3 - note C#, 2 - note E_, 2 + C# 2 + E_ 2 rest 2 octave 2 - note B_, 6 + B_ 6 octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - note D#, 2 - note E_, 2 + D_ 1 + C# 1 + D_ 2 + D# 2 + E_ 2 rest 2 octave 2 - note B_, 4 + B_ 4 octave 3 - note C#, 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 - note F#, 2 - note E_, 2 + D_ 2 + F# 2 + E_ 2 rest 2 octave 2 - note A_, 2 + A_ 2 rest 2 octave 3 - note D#, 2 + D# 2 rest 2 octave 2 - note G#, 2 + G# 2 rest 2 octave 3 - note C#, 2 + C# 2 rest 2 octave 2 - note F#, 2 + F# 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note E_, 2 - note G#, 2 - note F#, 2 + E_ 2 + G# 2 + F# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note F#, 2 + F# 2 rest 2 - note A_, 2 + A_ 2 rest 2 octave 3 - note C#, 2 + C# 2 rest 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note C#, 2 + C# 2 octave 2 - note B_, 2 + B_ 2 rest 2 octave 3 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note E_, 2 + E_ 2 rest 2 loopchannel 0, Music_Routes2_branch_9e9e endchannel @@ -326,101 +326,101 @@ Music_Routes2_branch_9e9e:: Music_Routes2_Ch4:: ; 9f08 (2:5f08) dspeed 12 - dnote 2, snare3 + snare3 2 rest 2 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 + snare3 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 3 - dnote 2, snare3 + snare3 2 rest 2 - dnote 2, snare3 + snare3 2 rest 4 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 rest 2 - dnote 2, snare3 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 - dnote 3, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 + snare3 3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 3 - dnote 2, snare3 + snare3 2 rest 2 - dnote 2, snare3 + snare3 2 rest 4 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 - dnote 3, snare3 - dnote 3, snare3 - dnote 3, snare3 + snare3 3 + snare3 3 + snare3 3 rest 3 dspeed 12 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 1 + snare3 1 + snare3 2 + snare3 2 + snare3 2 rest 2 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 3, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 3 rest 3 - dnote 3, snare3 + snare3 3 rest 3 loopchannel 0, Music_Routes2_Ch4 endchannel -; 0x9fad
\ No newline at end of file +; 0x9fad diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index 781d5c32..e62ca9bd 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,79 +1,79 @@ Music_Routes3_Ch1:: ; 9fad (2:5fad) - tempo 0, 148 - stereopanning 119 + tempo 148 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 5 octave 3 - note E_, 1 - note F#, 1 - note G_, 6 - note F_, 1 - note G_, 1 - note E_, 1 + E_ 1 + F# 1 + G_ 6 + F_ 1 + G_ 1 + E_ 1 rest 16 rest 15 Music_Routes3_branch_9fc3:: notetype 12, 11, 5 - note E_, 6 - note D_, 1 - note E_, 1 - note C_, 4 - note E_, 4 - note C_, 6 - note D_, 1 - note E_, 1 - note F_, 2 - note G_, 2 - note G_, 2 - note A_, 2 + E_ 6 + D_ 1 + E_ 1 + C_ 4 + E_ 4 + C_ 6 + D_ 1 + E_ 1 + F_ 2 + G_ 2 + G_ 2 + A_ 2 notetype 12, 10, 7 - note A#, 8 - note F_, 8 - note D_, 8 - note F_, 8 + A# 8 + F_ 8 + D_ 8 + F_ 8 notetype 12, 11, 5 - note E_, 6 - note D_, 1 - note E_, 1 - note C_, 4 - note E_, 4 - note C_, 6 - note D_, 1 - note E_, 1 - note F_, 2 - note G_, 2 - note G_, 2 - note A_, 2 + E_ 6 + D_ 1 + E_ 1 + C_ 4 + E_ 4 + C_ 6 + D_ 1 + E_ 1 + F_ 2 + G_ 2 + G_ 2 + A_ 2 notetype 12, 10, 7 - note A#, 8 - note A#, 8 - note D_, 8 - note F_, 8 + A# 8 + A# 8 + D_ 8 + F_ 8 notetype 12, 11, 5 - note E_, 4 - note E_, 2 - note F_, 2 - note G_, 4 - note F_, 2 - note E_, 2 - note B_, 2 + E_ 4 + E_ 2 + F_ 2 + G_ 4 + F_ 2 + E_ 2 + B_ 2 octave 2 - note G_, 4 + G_ 4 octave 3 - note B_, 8 - note A_, 2 + B_ 8 + A_ 2 notetype 8, 12, 3 - note A_, 4 - note F_, 4 - note A_, 4 + A_ 4 + F_ 4 + A_ 4 notetype 8, 4, 15 - note A_, 12 + A_ 12 notetype 8, 9, 0 - note F_, 12 - note G_, 12 + F_ 12 + G_ 12 loopchannel 0, Music_Routes3_branch_9fc3 @@ -82,13 +82,13 @@ Music_Routes3_Ch2:: ; a009 (2:6009) duty 2 notetype 12, 12, 7 octave 3 - note G_, 1 - note A#, 1 - note B_, 6 - note A_, 1 - note B_, 1 + G_ 1 + A# 1 + B_ 6 + A_ 1 + B_ 1 octave 4 - note C_, 1 + C_ 1 rest 15 rest 16 @@ -96,85 +96,85 @@ Music_Routes3_branch_a01a:: notetype 12, 12, 7 duty 2 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note C_, 1 - note E_, 10 + C_ 1 + E_ 10 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 8 - note F_, 8 + C_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + D_ 8 + F_ 8 notetype 12, 12, 5 duty 3 octave 3 - note A#, 8 - note A_, 8 + A# 8 + A_ 8 notetype 12, 12, 7 duty 2 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 1 + G_ 1 octave 4 - note C_, 1 - note E_, 10 + C_ 1 + E_ 10 octave 3 - note G_, 2 + G_ 2 octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 8 - note F_, 8 + C_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + D_ 8 + F_ 8 notetype 12, 12, 5 duty 3 octave 3 - note A#, 8 + A# 8 octave 4 - note D_, 6 + D_ 6 notetype 12, 12, 7 duty 2 - note C_, 1 - note D_, 1 - note E_, 2 - note D_, 2 - note E_, 2 - note C_, 8 + C_ 1 + D_ 1 + E_ 2 + D_ 2 + E_ 2 + C_ 8 octave 3 - note B_, 1 + B_ 1 octave 4 - note C_, 1 - note D_, 2 + C_ 1 + D_ 2 octave 3 - note G_, 4 + G_ 4 octave 4 - note G_, 8 - note F_, 1 - note E_, 1 + G_ 8 + F_ 1 + E_ 1 notetype 8, 13, 3 - note F_, 4 - note E_, 4 + F_ 4 + E_ 4 notetype 8, 12, 4 - note C_, 4 + C_ 4 notetype 8, 12, 5 - note C_, 12 + C_ 12 notetype 12, 10, 0 duty 3 octave 3 - note A_, 8 - note B_, 8 + A_ 8 + B_ 8 loopchannel 0, Music_Routes3_branch_a01a @@ -182,335 +182,335 @@ Music_Routes3_Ch3:: ; a07f (2:607f) vibrato 4, 1, 0 notetype 6, 1, 2 octave 4 - note G_, 2 - note A#, 2 - note B_, 8 - note A_, 8 - note G_, 2 + G_ 2 + A# 2 + B_ 8 + A_ 8 + G_ 2 rest 2 - note G_, 7 + G_ 7 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 2 + G_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note G_, 8 - note G_, 2 + G_ 8 + G_ 2 rest 2 - note G_, 7 + G_ 7 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note G_, 2 + G_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note G_, 8 + G_ 8 Music_Routes3_branch_a0a3:: notetype 12, 1, 2 - note E_, 1 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 4 - note E_, 1 + G_ 4 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 2 - note A_, 2 - note F_, 1 + G_ 2 + A_ 2 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 4 - note F_, 1 + A# 4 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 2 - note F_, 2 - note E_, 1 + A# 2 + F_ 2 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 4 - note E_, 1 + G_ 4 + E_ 1 rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 + G_ 4 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 2 - note A_, 2 - note F_, 1 + G_ 2 + A_ 2 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 4 - note F_, 1 + A# 4 + F_ 1 rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A# 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A#, 2 - note A_, 2 - note G_, 1 + A# 2 + A_ 2 + G_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 1 - note G_, 1 - note G_, 1 + G_ 1 + G_ 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 4 + D_ 4 octave 4 - note G_, 1 - note G_, 1 - note G_, 1 + G_ 1 + G_ 1 + G_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 octave 5 - note D_, 4 + D_ 4 octave 4 - note F_, 1 + F_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note F_, 1 - note F_, 1 - note F_, 1 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 octave 5 - note C_, 4 + C_ 4 octave 4 - note F_, 1 + F_ 1 rest 1 - note A_, 4 - note F_, 1 - note F_, 1 - note F_, 1 + A_ 4 + F_ 1 + F_ 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note A_, 4 + A_ 4 loopchannel 0, Music_Routes3_branch_a0a3 Music_Routes3_Ch4:: ; a131 (2:6131) dspeed 6 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare3 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 Music_Routes3_branch_a17a:: - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 4, mutedsnare2 - dnote 10, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare4 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 10, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 10, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 8, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 12, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare2 4 + mutedsnare2 10 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare4 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 10 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 10 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 8 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 12 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 loopchannel 0, Music_Routes3_branch_a17a -; 0xa26a
\ No newline at end of file +; 0xa26a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 3f0858be..742244bc 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,140 +1,140 @@ Music_Routes4_Ch1:: ; a26a (2:626a) - tempo 0, 148 - stereopanning 119 + tempo 148 + volume 7, 7 duty 3 vibrato 10, 3, 4 - togglecall + toggleperfectpitch notetype 12, 10, 2 octave 2 - note G#, 4 - note G#, 4 - note G#, 4 + G# 4 + G# 4 + G# 4 notetype 12, 7, 15 - note G#, 4 + G# 4 notetype 12, 10, 2 - note G#, 4 - note G#, 4 - note G#, 4 + G# 4 + G# 4 + G# 4 notetype 12, 11, 7 - note B_, 1 + B_ 1 octave 3 - note E_, 1 - note F#, 1 - note B_, 1 + E_ 1 + F# 1 + B_ 1 Music_Routes4_branch_a28a:: notetype 12, 11, 7 - note B_, 6 - note E_, 2 - note E_, 4 + B_ 6 + E_ 2 + E_ 4 octave 4 - note E_, 4 - note D_, 4 - note C#, 4 + E_ 4 + D_ 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 notetype 12, 11, 1 - note G#, 3 + G# 3 notetype 12, 11, 7 - note E_, 1 - note F#, 12 - note E_, 8 - note D#, 4 - note F#, 4 - note B_, 6 - note E_, 2 - note E_, 4 + E_ 1 + F# 12 + E_ 8 + D# 4 + F# 4 + B_ 6 + E_ 2 + E_ 4 octave 4 - note E_, 4 - note D_, 4 - note C#, 4 + E_ 4 + D_ 4 + C# 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note C#, 4 + C# 4 notetype 12, 11, 1 - note E_, 3 + E_ 3 notetype 12, 11, 7 - note D#, 1 - note E_, 12 + D# 1 + E_ 12 octave 3 - note B_, 3 - note A_, 1 - note G#, 8 + B_ 3 + A_ 1 + G# 8 octave 4 - note E_, 4 + E_ 4 octave 3 - note D_, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + D_ 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note C#, 2 - note D_, 2 - note D_, 2 + C# 2 + D_ 2 + D_ 2 octave 3 - note A_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + A_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 + F# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note D#, 2 - note E_, 2 + D# 2 + E_ 2 octave 3 - note B_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 + B_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + B_ 2 notetype 8, 11, 5 - note A_, 4 - note G#, 4 - note F#, 4 + A_ 4 + G# 4 + F# 4 octave 4 - note E_, 4 - note D#, 4 - note C#, 4 - note C#, 4 + E_ 4 + D# 4 + C# 4 + C# 4 octave 3 - note B_, 4 - note A_, 4 - note B_, 4 + B_ 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 - note D#, 4 + C# 4 + D# 4 octave 3 - note E_, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note B_, 4 + E_ 3 + F# 3 + G# 3 + A_ 3 + B_ 4 octave 4 - note C#, 4 - note D#, 4 - note E_, 3 + C# 4 + D# 4 + E_ 3 octave 3 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note A_, 3 + B_ 3 + G# 3 + F# 3 + E_ 3 + F# 3 + G# 3 + A_ 3 loopchannel 0, Music_Routes4_branch_a28a @@ -143,365 +143,365 @@ Music_Routes4_Ch2:: ; a304 (2:6304) duty 1 notetype 12, 9, 2 octave 3 - note E_, 3 - note F#, 1 + E_ 3 + F# 1 notetype 12, 9, 0 - note E_, 12 + E_ 12 notetype 12, 9, 2 octave 2 - note B_, 3 + B_ 3 octave 3 - note C_, 1 + C_ 1 notetype 12, 9, 0 octave 2 - note B_, 8 + B_ 8 duty 3 notetype 12, 12, 7 octave 3 - note E_, 1 - note F#, 1 - note B_, 1 + E_ 1 + F# 1 + B_ 1 octave 4 - note D#, 1 + D# 1 Music_Routes4_branch_a325:: notetype 12, 12, 7 - note E_, 6 + E_ 6 octave 3 - note B_, 2 - note B_, 4 + B_ 2 + B_ 4 octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note F#, 1 - note A_, 1 - note G#, 1 - note F#, 1 + B_ 4 + A_ 4 + G# 4 + F# 4 + F# 1 + A_ 1 + G# 1 + F# 1 notetype 12, 12, 2 - note G#, 3 - note E_, 1 + G# 3 + E_ 1 notetype 12, 10, 0 octave 3 - note B_, 12 + B_ 12 duty 0 notetype 12, 12, 2 octave 2 - note B_, 3 + B_ 3 notetype 12, 12, 7 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 8 + B_ 8 octave 3 - note D#, 4 + D# 4 duty 3 octave 4 - note E_, 6 + E_ 6 octave 3 - note B_, 2 - note B_, 4 + B_ 2 + B_ 4 octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note A_, 1 + B_ 4 + A_ 4 + G# 4 + F# 4 + A_ 1 octave 5 - note C#, 1 + C# 1 octave 4 - note B_, 1 - note A_, 1 + B_ 1 + A_ 1 notetype 12, 12, 2 - note B_, 3 + B_ 3 notetype 12, 12, 7 - note A_, 1 + A_ 1 notetype 12, 11, 0 - note G#, 6 + G# 6 notetype 12, 9, 0 - note G#, 6 + G# 6 notetype 12, 7, 0 - note G#, 6 + G# 6 notetype 12, 6, 15 - note G#, 6 + G# 6 notetype 12, 12, 7 - note G#, 4 + G# 4 notetype 8, 12, 3 - note A_, 4 - note G#, 4 - note F#, 4 + A_ 4 + G# 4 + F# 4 notetype 8, 9, 0 - note F#, 6 + F# 6 notetype 8, 7, 15 - note F#, 6 + F# 6 duty 0 notetype 8, 9, 0 octave 3 - note F#, 4 - note E_, 4 - note F#, 4 - note A_, 6 + F# 4 + E_ 4 + F# 4 + A_ 6 duty 3 notetype 8, 12, 7 octave 4 - note F#, 6 - note G#, 4 - note F#, 4 + F# 6 + G# 4 + F# 4 notetype 8, 12, 4 - note E_, 4 + E_ 4 notetype 8, 10, 0 - note E_, 12 + E_ 12 duty 0 notetype 8, 9, 0 octave 3 - note E_, 4 - note D#, 4 - note E_, 4 - note G#, 6 + E_ 4 + D# 4 + E_ 4 + G# 6 duty 3 notetype 8, 12, 7 octave 4 - note E_, 6 - note F#, 4 - note D#, 4 + E_ 6 + F# 4 + D# 4 octave 3 - note B_, 4 + B_ 4 notetype 8, 10, 0 octave 4 - note B_, 16 + B_ 16 notetype 8, 10, 7 - note B_, 8 + B_ 8 notetype 8, 11, 0 - note A_, 6 + A_ 6 notetype 8, 11, 7 - note A_, 6 + A_ 6 notetype 12, 10, 7 - note G#, 1 - note F#, 1 + G# 1 + F# 1 notetype 12, 11, 0 - note E_, 12 + E_ 12 notetype 12, 10, 0 - note E_, 8 + E_ 8 notetype 12, 10, 7 - note E_, 10 + E_ 10 loopchannel 0, Music_Routes4_branch_a325 Music_Routes4_Ch3:: ; a3c4 (2:63c4) notetype 12, 1, 0 octave 4 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note D#, 1 + D# 1 rest 3 Music_Routes4_branch_a3d7:: - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note D_, 1 + D_ 1 rest 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 + F# 1 + F# 1 + F# 1 + F# 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 3 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 + G# 1 + G# 1 + G# 1 + G# 1 + G# 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 + E_ 1 rest 1 - note E_, 1 + E_ 1 rest 3 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_Routes4_branch_a3d7 @@ -510,173 +510,173 @@ Music_Routes4_Ch4:: ; a49d (2:649d) dspeed 12 rest 16 rest 12 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 Music_Routes4_branch_a4a8:: - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 2, mutedsnare2 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 4, mutedsnare2 - dnote 1, mutedsnare4 - dnote 1, mutedsnare4 - dnote 1, mutedsnare3 - dnote 1, mutedsnare3 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 - dnote 2, mutedsnare2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare3 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare2 2 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare2 4 + mutedsnare4 1 + mutedsnare4 1 + mutedsnare3 1 + mutedsnare3 1 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 + mutedsnare2 2 loopchannel 0, Music_Routes4_branch_a4a8 -; 0xa5f0
\ No newline at end of file +; 0xa5f0 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 679ba0bd..3e0657fd 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -1,41 +1,41 @@ Music_SafariZone_Ch1:: ; bc2e (2:7c2e) - tempo 0, 132 - stereopanning 119 + tempo 132 + volume 7, 7 vibrato 6, 3, 4 - togglecall + toggleperfectpitch duty 2 notetype 12, 9, 2 octave 3 pitchbend 0, 73 - note C_, 1 + C_ 1 pitchbend 0, 73 - note G_, 1 + G_ 1 pitchbend 0, 73 - note C_, 1 + C_ 1 pitchbend 0, 73 - note G_, 1 + G_ 1 rest 4 duty 3 Music_SafariZone_branch_bc4f:: callchannel Music_SafariZone_branch_bc5f notetype 12, 10, 4 - note F#, 4 + F# 4 callchannel Music_SafariZone_branch_bc5f notetype 12, 10, 4 - note F#, 4 + F# 4 loopchannel 0, Music_SafariZone_branch_bc4f Music_SafariZone_branch_bc5f:: notetype 12, 10, 2 octave 3 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 + C_ 4 + G_ 4 + C_ 4 + G_ 4 + C_ 4 + G_ 4 + C_ 4 endchannel @@ -44,32 +44,32 @@ Music_SafariZone_Ch2:: ; bc6a (2:7c6a) vibrato 8, 2, 5 notetype 12, 10, 2 octave 4 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 + G_ 1 + D_ 1 + G_ 1 + D_ 1 rest 4 duty 3 Music_SafariZone_branch_bc79:: callchannel Music_SafariZone_branch_bc89 notetype 12, 11, 5 - note A_, 4 + A_ 4 callchannel Music_SafariZone_branch_bc89 notetype 12, 11, 5 - note B_, 4 + B_ 4 loopchannel 0, Music_SafariZone_branch_bc79 Music_SafariZone_branch_bc89:: notetype 12, 11, 2 octave 3 - note G_, 4 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 + G_ 4 + D_ 4 + G_ 4 + D_ 4 + G_ 4 + D_ 4 + G_ 4 endchannel @@ -80,33 +80,33 @@ Music_SafariZone_Ch3:: ; bc94 (2:7c94) Music_SafariZone_branch_bc97:: callchannel Music_SafariZone_branch_bca5 octave 4 - note A_, 4 + A_ 4 callchannel Music_SafariZone_branch_bca5 octave 4 - note B_, 4 + B_ 4 loopchannel 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 - note A_, 2 + A_ 2 rest 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note A_, 2 + A_ 2 rest 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note A_, 2 + A_ 2 rest 2 octave 4 - note D_, 2 + D_ 2 rest 2 octave 3 - note A_, 2 + A_ 2 rest 2 endchannel -; 0xbcbb
\ No newline at end of file +; 0xbcbb diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index b6c70ec7..c5cb1675 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,397 +1,397 @@ Music_SilphCo_Ch1:: ; 7f243 (1f:7243) - tempo 0, 160 - stereopanning 119 + tempo 160 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch vibrato 8, 2, 2 notetype 6, 11, 3 octave 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 + E_ 1 + F# 1 + G# 1 + A# 1 octave 3 - note C_, 1 + C_ 1 notetype 6, 10, 0 - note C_, 12 + C_ 12 notetype 6, 11, 3 - note C_, 2 + C_ 2 octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note E_, 2 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 + E_ 2 rest 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 Music_SilphCo_branch_7f26d:: - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note A#, 2 + A# 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 octave 3 - note C_, 2 + C_ 2 rest 2 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note A#, 2 + A# 2 rest 6 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 10 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 + E_ 1 + F# 1 + G# 1 + A_ 1 notetype 6, 10, 0 - note B_, 12 + B_ 12 notetype 6, 11, 3 - note B_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note E_, 1 + B_ 1 + A_ 1 + G_ 1 + F_ 1 + E_ 1 rest 11 - note F_, 1 - note G#, 1 - note A#, 1 - note B_, 1 + F_ 1 + G# 1 + A# 1 + B_ 1 notetype 6, 10, 0 octave 3 - note C_, 12 + C_ 12 notetype 6, 11, 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A_, 1 - note G_, 1 - note F_, 1 + B_ 1 + A_ 1 + G_ 1 + F_ 1 rest 11 - note F#, 1 - note B_, 1 + F# 1 + B_ 1 octave 3 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 notetype 6, 10, 0 - note D_, 12 + D_ 12 notetype 6, 11, 3 - note D_, 1 - note C_, 1 + D_ 1 + C_ 1 octave 2 - note A#, 1 - note G_, 1 - note F_, 1 + A# 1 + G_ 1 + F_ 1 rest 11 - note F_, 1 - note G#, 1 - note A#, 1 - note B_, 1 + F_ 1 + G# 1 + A# 1 + B_ 1 notetype 6, 10, 0 octave 3 - note C_, 12 + C_ 12 notetype 6, 11, 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note G#, 1 - note F_, 1 - note E_, 1 + B_ 1 + G# 1 + F_ 1 + E_ 1 rest 7 notetype 6, 8, 0 - note B_, 16 + B_ 16 notetype 6, 11, 0 octave 3 - note E_, 8 - tempo 0, 124 + E_ 8 + tempo 124 notetype 6, 11, 3 octave 2 - note B_, 2 + B_ 2 rest 10 - note B_, 2 + B_ 2 rest 10 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 16 rest 6 - note A_, 2 + A_ 2 rest 6 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note A_, 2 - note A#, 2 - note B_, 2 - note A#, 2 + B_ 2 + A# 2 + B_ 2 + A# 2 + A_ 2 + A# 2 + B_ 2 + A# 2 callchannel Music_SilphCo_branch_7f3f0 callchannel Music_SilphCo_branch_7f3f0 callchannel Music_SilphCo_branch_7f3f0 rest 4 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note A#, 2 + A# 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A_, 2 + A_ 2 rest 6 - note A#, 2 + A# 2 rest 6 - note A#, 2 + A# 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 3 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 3 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 4 - note C_, 2 + C_ 2 rest 6 - note C_, 2 + C_ 2 rest 6 octave 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 octave 4 - note E_, 2 + E_ 2 rest 6 - note E_, 2 + E_ 2 rest 6 - note D#, 2 + D# 2 rest 6 - note D#, 2 + D# 2 rest 2 octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 notetype 6, 6, 0 - note E_, 16 - note E_, 11 + E_ 16 + E_ 11 notetype 6, 11, 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 + E_ 1 + F# 1 + G# 1 + A# 1 octave 3 - note C_, 1 + C_ 1 notetype 6, 3, 15 - note C_, 16 + C_ 16 notetype 6, 10, 0 - note C_, 11 + C_ 11 notetype 6, 9, 3 octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 notetype 6, 3, 15 - note E_, 16 + E_ 16 notetype 6, 9, 0 - note E_, 11 + E_ 11 notetype 6, 11, 3 - note F_, 1 - note G_, 1 - note A#, 1 + F_ 1 + G_ 1 + A# 1 octave 3 - note C_, 1 - note D_, 1 + C_ 1 + D_ 1 notetype 6, 3, 15 - note D_, 16 + D_ 16 notetype 6, 10, 7 - note D_, 11 + D_ 11 rest 4 rest 4 - tempo 0, 128 + tempo 128 rest 4 rest 4 - tempo 0, 136 + tempo 136 rest 4 rest 4 - tempo 0, 144 + tempo 144 rest 4 rest 4 - tempo 0, 160 + tempo 160 rest 4 rest 4 - tempo 0, 192 + tempo 192 rest 4 rest 4 - tempo 1, 32 + tempo 288 rest 4 rest 4 - tempo 1, 160 + tempo 416 rest 4 - tempo 4, 0 + tempo 1024 rest 4 - tempo 0, 160 + tempo 160 rest 4 notetype 6, 4, 3 octave 2 - note B_, 2 + B_ 2 rest 6 notetype 6, 6, 3 - note B_, 2 + B_ 2 rest 6 notetype 6, 8, 3 - note B_, 2 + B_ 2 rest 6 notetype 6, 5, 0 - note B_, 8 + B_ 8 notetype 6, 11, 3 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 loopchannel 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 3 - note C_, 2 + C_ 2 endchannel @@ -400,382 +400,382 @@ Music_SilphCo_Ch2:: ; 7f409 (1f:7409) duty 3 notetype 6, 12, 3 octave 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 + E_ 1 + F# 1 + G# 1 + A# 1 octave 4 - note C_, 1 + C_ 1 notetype 6, 11, 0 - note C_, 12 + C_ 12 notetype 6, 12, 3 - note C_, 2 + C_ 2 octave 3 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note E_, 2 + B_ 1 + A# 1 + G# 1 + F# 1 + E_ 1 + E_ 2 rest 2 octave 2 - note G_, 2 + G_ 2 rest 6 - note F#, 2 + F# 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G#, 2 + G# 2 rest 2 Music_SilphCo_branch_7f42e:: - note E_, 2 + E_ 2 rest 2 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note F#, 2 + F# 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G#, 2 + G# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 2 notetype 6, 11, 7 duty 2 octave 4 - note E_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - note E_, 8 - note D#, 8 - note D_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - note F#, 8 - note G_, 8 - note G#, 8 - note D#, 8 - note D_, 8 - note D#, 8 + E_ 8 + D# 8 + E_ 8 + F_ 8 + E_ 8 + D# 8 + D_ 8 + D# 8 + E_ 8 + F_ 8 + F# 8 + G_ 8 + G# 8 + D# 8 + D_ 8 + D# 8 duty 3 notetype 6, 6, 15 - note E_, 16 + E_ 16 notetype 6, 12, 0 - note B_, 16 + B_ 16 notetype 6, 12, 4 octave 3 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 octave 4 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 notetype 6, 12, 4 duty 3 octave 3 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note D#, 4 - note E_, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + D# 4 + E_ 4 notetype 6, 12, 0 - note F_, 8 + F_ 8 notetype 6, 11, 7 - note F_, 8 + F_ 8 notetype 6, 8, 10 - note F_, 4 + F_ 4 notetype 6, 12, 4 duty 3 - note F_, 4 - note E_, 4 - note F_, 4 + F_ 4 + E_ 4 + F_ 4 notetype 6, 10, 0 - note F#, 8 + F# 8 notetype 6, 11, 0 - note F#, 8 + F# 8 notetype 6, 9, 9 - note F#, 4 + F# 4 notetype 6, 12, 4 - note F#, 4 - note F_, 4 - note F#, 4 + F# 4 + F_ 4 + F# 4 notetype 6, 9, 0 - note G_, 12 + G_ 12 notetype 6, 5, 9 - note G_, 8 + G_ 8 notetype 6, 12, 4 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note F_, 4 - note F#, 4 - note F_, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note C#, 4 - note D_, 4 - note D#, 4 - note D_, 4 + G_ 4 + F# 4 + G_ 4 + F# 4 + F_ 4 + F# 4 + F_ 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + C# 4 + D_ 4 + D# 4 + D_ 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A_, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + A_ 4 notetype 6, 11, 4 duty 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A#, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + A# 4 notetype 6, 11, 4 duty 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note B_, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + B_ 4 notetype 6, 11, 4 duty 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 notetype 6, 12, 2 duty 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 + F_ 4 + F# 4 + G_ 4 + G# 4 octave 4 - note C_, 4 + C_ 4 notetype 6, 11, 4 duty 3 octave 3 - note D#, 4 - note D_, 4 - note D#, 4 + D# 4 + D_ 4 + D# 4 rest 4 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 2 duty 0 octave 4 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 - note G#, 2 + G# 2 rest 6 duty 3 octave 3 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G_, 2 + G_ 2 rest 2 duty 0 octave 4 - note E_, 2 + E_ 2 rest 2 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 2 duty 3 octave 3 - note G_, 2 + G_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 - note G_, 2 + G_ 2 rest 2 octave 4 - note C_, 2 + C_ 2 rest 2 octave 3 - note G_, 2 + G_ 2 rest 2 notetype 6, 8, 7 octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 rest 4 notetype 6, 4, 3 octave 2 - note G_, 2 + G_ 2 rest 6 notetype 6, 6, 3 - note F#, 2 + F# 2 rest 6 notetype 6, 8, 3 - note G_, 2 + G_ 2 rest 6 notetype 6, 4, 15 - note G#, 8 + G# 8 notetype 6, 11, 4 - note G_, 2 + G_ 2 rest 6 - note F#, 2 + F# 2 rest 6 - note G_, 2 + G_ 2 rest 6 - note G#, 2 + G# 2 rest 2 loopchannel 0, Music_SilphCo_branch_7f42e @@ -785,191 +785,191 @@ Music_SilphCo_Ch3:: ; 7f5be (1f:75be) notetype 12, 1, 1 rest 12 octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 Music_SilphCo_branch_7f5c9:: - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 1 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G#, 1 + G# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 5 - note F_, 1 + F_ 1 rest 5 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 11 - note D#, 1 + D# 1 rest 3 - note E_, 1 + E_ 1 rest 5 - note F_, 1 + F_ 1 rest 5 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 11 - note D#, 1 + D# 1 rest 3 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F#, 1 + F# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note F#, 1 + F# 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note F_, 1 + F_ 1 rest 3 - note E_, 1 + E_ 1 rest 3 - note D#, 1 + D# 1 rest 3 - note D_, 1 + D_ 1 rest 1 - note D_, 8 - note F_, 8 - note D_, 8 - note F#, 8 - note D_, 8 - note G_, 8 - note D_, 8 - note A_, 8 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + D_ 8 + F_ 8 + D_ 8 + F# 8 + D_ 8 + G_ 8 + D_ 8 + A_ 8 + E_ 4 + D# 4 + E_ 4 + F_ 4 octave 5 - note E_, 2 - note D#, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note D#, 2 + E_ 2 + D# 2 + E_ 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + D# 2 octave 4 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 octave 5 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note D#, 2 + E_ 2 + F_ 2 + F# 2 + G_ 2 + G# 2 + D# 2 + D_ 2 + D# 2 octave 6 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 + E_ 4 + D# 4 + D_ 4 + D# 4 + E_ 4 + F_ 4 + F# 4 + G_ 4 + G# 4 + D# 4 + D_ 4 + D# 4 notetype 6, 1, 1 rest 4 rest 4 @@ -993,9 +993,9 @@ Music_SilphCo_branch_7f5c9:: rest 4 rest 4 octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 + E_ 4 + D# 4 + E_ 4 + F_ 4 loopchannel 0, Music_SilphCo_branch_7f5c9 -; 0x7f69d
\ No newline at end of file +; 0x7f69d diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index 675b67d1..db55e3b6 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,109 +1,109 @@ Music_SSAnne_Ch1:: ; b3a7 (2:73a7) - tempo 0, 128 - stereopanning 119 + tempo 128 + volume 7, 7 duty 1 vibrato 8, 3, 4 - togglecall + toggleperfectpitch Music_SSAnne_branch_b3b2:: notetype 12, 10, 4 rest 12 octave 3 - note E_, 2 - note F#, 2 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 + E_ 2 + F# 2 + E_ 4 + D_ 4 + C# 2 + D_ 2 + E_ 2 rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 + E_ 4 + F# 2 + D_ 2 + E_ 4 + F# 4 + G# 4 rest 4 - note E_, 4 - note G#, 4 + E_ 4 + G# 4 rest 4 - note C#, 2 - note E_, 2 - note F#, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 + C# 2 + E_ 2 + F# 4 + D_ 4 + E_ 4 + D_ 4 + C# 2 + D_ 2 + E_ 2 rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note F#, 4 + E_ 4 + F# 2 + D_ 2 + E_ 4 + F# 4 + G# 4 + F# 4 + E_ 4 + F# 4 rest 4 - note C#, 2 - note E_, 2 - note F#, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 + C# 2 + E_ 2 + F# 4 + D_ 4 + E_ 4 + D_ 4 + C# 2 + D_ 2 + E_ 2 rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - note F#, 8 - note G#, 4 - note E_, 4 + E_ 4 + F# 2 + D_ 2 + E_ 4 + F# 4 + G# 4 + F# 8 + G# 4 + E_ 4 rest 4 - note E_, 4 - note F#, 2 - note E_, 2 - note D_, 4 + E_ 4 + F# 2 + E_ 2 + D_ 4 rest 4 - note D_, 4 - note E_, 4 - note C#, 4 + D_ 4 + E_ 4 + C# 4 rest 4 - note C#, 4 - note D_, 2 - note C#, 2 + C# 4 + D_ 2 + C# 2 octave 2 - note B_, 4 - note E_, 4 - note B_, 4 + B_ 4 + E_ 4 + B_ 4 octave 3 - note D_, 2 + D_ 2 octave 2 - note B_, 2 - note A_, 4 + B_ 2 + A_ 4 rest 4 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 4 + A_ 4 + B_ 2 + A_ 2 + G# 4 rest 4 - note C#, 4 - note G#, 4 - note A_, 4 + C# 4 + G# 4 + A_ 4 rest 4 - note A_, 4 - note B_, 4 - note B_, 4 + A_ 4 + B_ 4 + B_ 4 rest 4 octave 3 - note D_, 8 + D_ 8 loopchannel 0, Music_SSAnne_branch_b3b2 @@ -114,171 +114,171 @@ Music_SSAnne_Ch2:: ; b419 (2:7419) Music_SSAnne_branch_b41e:: notetype 12, 12, 5 octave 3 - note A_, 2 - note E_, 2 - note A_, 4 - note B_, 4 + A_ 2 + E_ 2 + A_ 4 + B_ 4 octave 4 - note D_, 4 + D_ 4 notetype 8, 12, 5 - note C#, 2 - note D_, 2 - note C#, 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 6 + G# 6 + A_ 3 + B_ 3 octave 4 - note C#, 6 - note D_, 6 - note C#, 3 + C# 6 + D_ 6 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 6 - note D_, 3 - note C#, 3 + E_ 6 + D_ 3 + C# 3 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 3 + C# 3 octave 3 - note B_, 3 - note A_, 3 - note E_, 3 - note A_, 6 - note B_, 6 + B_ 3 + A_ 3 + E_ 3 + A_ 6 + B_ 6 octave 4 - note D_, 6 - note C#, 2 - note D_, 2 - note C#, 2 + D_ 6 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 6 + G# 6 + A_ 3 + B_ 3 octave 4 - note C#, 6 - note D_, 6 - note C#, 3 + C# 6 + D_ 6 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 6 - note D_, 3 - note C#, 3 + E_ 6 + D_ 3 + C# 3 octave 3 - note B_, 12 - note A_, 3 - note E_, 3 - note A_, 6 - note B_, 6 + B_ 12 + A_ 3 + E_ 3 + A_ 6 + B_ 6 octave 4 - note D_, 6 - note C#, 2 - note D_, 2 - note C#, 2 + D_ 6 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 6 + G# 6 + A_ 3 + B_ 3 octave 4 - note C#, 6 - note D_, 6 - note C#, 3 + C# 6 + D_ 6 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 6 - note D_, 3 - note C#, 3 + E_ 6 + D_ 3 + C# 3 octave 3 - note B_, 12 + B_ 12 rest 3 octave 4 - note C#, 3 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note C#, 3 - note C#, 3 - note D_, 3 - note C#, 3 - note D_, 3 - note E_, 3 + C# 3 + C# 3 + D_ 3 + C# 3 + D_ 3 + E_ 3 octave 3 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note B_, 3 + B_ 3 + G# 3 + F# 3 + E_ 3 + F# 3 + G# 3 + B_ 3 rest 3 - note A_, 3 - note G#, 3 - note A_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note B_, 3 + A_ 3 + G# 3 + A_ 3 + A_ 3 + B_ 3 + A_ 3 + B_ 3 octave 4 - note C#, 3 + C# 3 octave 3 - note G#, 3 - note F#, 3 - note E_, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note B_, 3 + G# 3 + F# 3 + E_ 3 + E_ 3 + F# 3 + G# 3 + B_ 3 rest 3 - note F#, 3 - note E_, 3 - note F#, 3 - note F#, 3 - note G#, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note E_, 3 - note C#, 3 + F# 3 + E_ 3 + F# 3 + F# 3 + G# 3 + F# 3 + G# 3 + A_ 3 + E_ 3 + C# 3 octave 2 - note B_, 3 - note A_, 3 - note B_, 3 + B_ 3 + A_ 3 + B_ 3 octave 3 - note C#, 3 - note E_, 3 + C# 3 + E_ 3 rest 3 - note F#, 3 - note E_, 3 - note F#, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note B_, 3 + F# 3 + E_ 3 + F# 3 + F# 3 + G# 3 + A_ 3 + B_ 3 octave 4 - note C#, 3 - note D_, 3 - note C#, 3 + C# 3 + D_ 3 + C# 3 octave 3 - note B_, 3 + B_ 3 octave 4 - note E_, 3 - note D_, 3 - note C#, 3 + E_ 3 + D_ 3 + C# 3 octave 3 - note B_, 3 + B_ 3 loopchannel 0, Music_SSAnne_branch_b41e @@ -287,53 +287,53 @@ Music_SSAnne_Ch3:: ; b4cb (2:74cb) rest 16 rest 12 octave 4 - note B_, 2 - note G#, 2 - note A_, 8 - note F#, 8 - note G#, 4 + B_ 2 + G# 2 + A_ 8 + F# 8 + G# 4 rest 4 - note B_, 8 - note A_, 8 - note B_, 8 - note A_, 8 - note G#, 8 - note A_, 8 - note F#, 8 - note G#, 8 - note B_, 8 - note A_, 4 - note E_, 4 - note B_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note G#, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A_, 4 + B_ 8 + A_ 8 + B_ 8 + A_ 8 + G# 8 + A_ 8 + F# 8 + G# 8 + B_ 8 + A_ 4 + E_ 4 + B_ 4 + E_ 4 + A_ 4 + E_ 4 + G# 4 + E_ 4 + A_ 4 + E_ 4 + F# 4 + G_ 4 + G# 4 + A_ 4 octave 5 - note D_, 8 - note C#, 8 - note C#, 8 + D_ 8 + C# 8 + C# 8 octave 4 - note B_, 8 - note B_, 8 - note A_, 8 - note A_, 8 - note G#, 8 - note G#, 8 - note F#, 8 - note F#, 8 - note E_, 8 - note E_, 8 - note F#, 8 - note F#, 8 - note G#, 8 - note B_, 8 + B_ 8 + B_ 8 + A_ 8 + A_ 8 + G# 8 + G# 8 + F# 8 + F# 8 + E_ 8 + E_ 8 + F# 8 + F# 8 + G# 8 + B_ 8 loopchannel 0, Music_SSAnne_Ch3 -; 0xb504
\ No newline at end of file +; 0xb504 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index c96e796a..2b829caf 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,118 +1,118 @@ Music_Surfing_Ch1:: ; 7fa19 (1f:7a19) - tempo 0, 160 - stereopanning 119 + tempo 160 + volume 7, 7 duty 3 vibrato 12, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 5 rest 6 octave 2 - note A_, 2 - note G#, 3 - note F#, 1 - note E_, 6 + A_ 2 + G# 3 + F# 1 + E_ 6 octave 3 - note G#, 2 - note F#, 2 - note G#, 4 + G# 2 + F# 2 + G# 4 Music_Surfing_branch_7fa30:: notetype 12, 11, 2 - note E_, 2 - note E_, 4 - note E_, 2 - note E_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 + E_ 2 + E_ 4 + E_ 2 + E_ 4 + D_ 2 + D_ 4 + D_ 2 + D_ 4 + D_ 2 + D_ 4 notetype 12, 11, 1 - note F#, 3 + F# 3 notetype 12, 11, 2 - note D_, 3 - note E_, 2 - note E_, 4 - note E_, 2 - note E_, 4 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 4 - note F#, 2 - note F#, 4 - note E_, 2 - note E_, 4 - note G#, 2 - note G#, 4 + D_ 3 + E_ 2 + E_ 4 + E_ 2 + E_ 4 + A_ 2 + A_ 4 + G# 2 + G# 4 + F# 2 + F# 4 + E_ 2 + E_ 4 + G# 2 + G# 4 notetype 12, 11, 1 - note F#, 3 + F# 3 notetype 12, 11, 2 - note G#, 1 + G# 1 notetype 12, 11, 4 - note A_, 2 - note B_, 2 + A_ 2 + B_ 2 octave 4 - note C_, 2 + C_ 2 notetype 12, 11, 7 - note C#, 6 + C# 6 notetype 12, 11, 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + G# 2 + F# 2 + E_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + B_ 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note B_, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + A_ 2 + G# 2 + A_ 2 + E_ 2 + G# 2 + B_ 2 octave 4 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 4 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 4 loopchannel 0, Music_Surfing_branch_7fa30 @@ -121,85 +121,85 @@ Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c) vibrato 16, 2, 5 notetype 12, 12, 6 octave 3 - note A_, 2 - note G#, 3 - note F#, 1 - note E_, 6 - note G#, 6 + A_ 2 + G# 3 + F# 1 + E_ 6 + G# 6 octave 4 - note E_, 2 - note D_, 2 + E_ 2 + D_ 2 octave 3 - note B_, 2 + B_ 2 Music_Surfing_branch_7faae:: notetype 12, 12, 6 octave 4 - note E_, 6 - note C#, 5 - note E_, 1 - note D_, 6 + E_ 6 + C# 5 + E_ 1 + D_ 6 octave 3 - note B_, 6 + B_ 6 octave 4 - note D_, 6 + D_ 6 octave 3 - note B_, 2 + B_ 2 notetype 12, 12, 1 octave 4 - note F#, 3 + F# 3 notetype 12, 12, 6 - note D_, 1 - note E_, 6 - note C#, 6 - note E_, 6 - note C#, 5 - note E_, 1 - note F#, 6 - note D_, 6 - note F#, 6 - note E_, 2 + D_ 1 + E_ 6 + C# 6 + E_ 6 + C# 5 + E_ 1 + F# 6 + D_ 6 + F# 6 + E_ 2 notetype 12, 12, 1 - note F#, 3 + F# 3 notetype 12, 12, 6 - note E_, 1 - note A_, 6 - note A_, 6 - note B_, 2 - note A_, 3 - note D_, 1 - note F#, 6 - note E_, 2 - note F#, 3 - note E_, 1 - note C#, 6 - note D_, 2 - note C#, 3 + E_ 1 + A_ 6 + A_ 6 + B_ 2 + A_ 3 + D_ 1 + F# 6 + E_ 2 + F# 3 + E_ 1 + C# 6 + D_ 2 + C# 3 octave 3 - note B_, 1 + B_ 1 octave 4 - note F#, 6 - note E_, 2 - note D#, 3 - note E_, 1 - note A_, 6 - note B_, 2 - note A_, 3 - note D_, 1 - note F#, 6 - note E_, 2 - note F#, 3 - note G#, 1 - note A_, 6 - note G#, 2 - note F#, 3 - note E_, 1 - note G#, 6 - note A_, 2 - note G#, 3 - note A_, 1 + F# 6 + E_ 2 + D# 3 + E_ 1 + A_ 6 + B_ 2 + A_ 3 + D_ 1 + F# 6 + E_ 2 + F# 3 + G# 1 + A_ 6 + G# 2 + F# 3 + E_ 1 + G# 6 + A_ 2 + G# 3 + A_ 1 octave 5 - note C#, 6 + C# 6 loopchannel 0, Music_Surfing_branch_7faae @@ -207,130 +207,130 @@ Music_Surfing_Ch3:: ; 7fafa (1f:7afa) notetype 12, 1, 0 rest 12 octave 5 - note E_, 6 + E_ 6 octave 4 - note E_, 2 - note F#, 2 - note G#, 2 + E_ 2 + F# 2 + G# 2 Music_Surfing_branch_7fb03:: octave 3 - note A_, 2 + A_ 2 octave 4 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 1 + G# 2 + G# 2 + E_ 2 + G# 1 rest 2 - note E_, 1 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 + E_ 1 + C# 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 1 + G# 2 + G# 2 + E_ 2 + G# 1 rest 2 - note E_, 1 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note F#, 2 + E_ 1 + C# 2 + A_ 2 + A_ 2 + E_ 2 + A_ 2 + A_ 2 + D_ 2 + F# 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note F#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note G#, 2 + F# 2 + F# 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + A_ 2 + A_ 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note A_, 2 + G# 2 + G# 2 + E_ 2 + A_ 2 + A_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note A_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note F#, 2 + A_ 2 + A_ 2 + D_ 2 + F# 2 + F# 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note F#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note G#, 2 + F# 2 + F# 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + A_ 2 + A_ 2 + E_ 2 + G# 2 + G# 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note D_, 2 - note E_, 2 + G# 2 + G# 2 + E_ 2 + A_ 2 + A_ 2 + C# 2 + D_ 2 + E_ 2 loopchannel 0, Music_Surfing_branch_7fb03 -; 0x7fb7d
\ No newline at end of file +; 0x7fb7d diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index a3ab8031..359ff877 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,156 +1,156 @@ Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 vibrato 9, 3, 4 duty 3 notetype 12, 12, 1 octave 2 - note E_, 1 - note G_, 1 - note B_, 1 + E_ 1 + G_ 1 + B_ 1 octave 3 - note D_, 1 + D_ 1 octave 2 - note G_, 4 - note G_, 6 - note G_, 1 - note G_, 1 - note G_, 4 - note G_, 4 - note G_, 4 + G_ 4 + G_ 6 + G_ 1 + G_ 1 + G_ 4 + G_ 4 + G_ 4 notetype 8, 12, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note F#, 2 + A_ 2 + A_ 2 + A_ 2 + A_ 2 + A_ 2 + F# 2 Music_TitleScreen_branch_7e4e2:: callchannel Music_TitleScreen_branch_7e541 callchannel Music_TitleScreen_branch_7e54a callchannel Music_TitleScreen_branch_7e541 octave 3 - note C_, 8 + C_ 8 notetype 8, 12, 6 - note E_, 4 - note E_, 4 - note C_, 4 + E_ 4 + E_ 4 + C_ 4 notetype 12, 12, 6 octave 2 - note B_, 8 + B_ 8 notetype 8, 14, 7 octave 3 - note F_, 4 - note E_, 4 - note C_, 4 + F_ 4 + E_ 4 + C_ 4 notetype 12, 14, 7 - note D_, 10 + D_ 10 notetype 12, 12, 6 octave 2 - note B_, 2 + B_ 2 octave 3 - note C_, 2 - note D_, 2 + C_ 2 + D_ 2 callchannel Music_TitleScreen_branch_7e541 callchannel Music_TitleScreen_branch_7e54a callchannel Music_TitleScreen_branch_7e541 - note C_, 6 - note C_, 6 - note E_, 4 - note D_, 6 - note F_, 2 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 6 - note A_, 4 - note F_, 2 - note A_, 2 + C_ 6 + C_ 6 + E_ 4 + D_ 6 + F_ 2 + G_ 2 + D_ 4 + G_ 2 + G_ 6 + A_ 4 + F_ 2 + A_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note D_, 12 - note E_, 4 - note F_, 8 - note G_, 4 - note F_, 4 - note E_, 12 - note F_, 4 - note G_, 8 + D_ 12 + E_ 4 + F_ 8 + G_ 4 + F_ 4 + E_ 12 + F_ 4 + G_ 8 notetype 12, 11, 6 octave 4 - note C_, 4 - note C#, 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e55c notetype 8, 11, 4 octave 4 - note C_, 4 - note C_, 4 - note C#, 4 + C_ 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e55c notetype 8, 11, 2 octave 3 - note E_, 4 - note E_, 4 - note C#, 4 + E_ 4 + E_ 4 + C# 4 loopchannel 0, Music_TitleScreen_branch_7e4e2 Music_TitleScreen_branch_7e541:: notetype 12, 12, 6 octave 3 - note D_, 6 + D_ 6 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 8 + D_ 8 endchannel Music_TitleScreen_branch_7e54a:: - note C_, 6 - note F_, 6 - note C_, 4 - note D_, 8 + C_ 6 + F_ 6 + C_ 4 + D_ 8 notetype 12, 14, 7 - note F_, 6 - note E_, 1 - note D#, 1 - note D_, 8 + F_ 6 + E_ 1 + D# 1 + D_ 8 notetype 8, 12, 6 - note C_, 4 + C_ 4 octave 2 - note B_, 4 + B_ 4 octave 3 - note C_, 4 + C_ 4 endchannel Music_TitleScreen_branch_7e55c:: notetype 12, 12, 1 - note D_, 1 + D_ 1 rest 1 octave 2 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 + D_ 1 rest 1 - note D_, 1 - note D_, 1 + D_ 1 + D_ 1 endchannel @@ -159,194 +159,194 @@ Music_TitleScreen_Ch2:: ; 7e578 (1f:6578) duty 1 notetype 12, 14, 1 octave 2 - note G_, 1 - note B_, 1 + G_ 1 + B_ 1 octave 3 - note D_, 1 - note F#, 1 - note G_, 4 - note G_, 6 - note G_, 1 - note G_, 1 - note G_, 4 - note G_, 4 - note G_, 4 + D_ 1 + F# 1 + G_ 4 + G_ 6 + G_ 1 + G_ 1 + G_ 4 + G_ 4 + G_ 4 notetype 8, 14, 1 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F#, 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + F# 2 Music_TitleScreen_branch_7e594:: vibrato 16, 4, 6 callchannel Music_TitleScreen_branch_7e622 octave 2 - note A_, 4 - note F_, 4 + A_ 4 + F_ 4 callchannel Music_TitleScreen_branch_7e62c octave 2 - note A_, 8 - note B_, 16 + A_ 8 + B_ 16 callchannel Music_TitleScreen_branch_7e622 octave 2 - note A_, 6 - note F_, 2 + A_ 6 + F_ 2 notetype 8, 14, 7 octave 4 - note C_, 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 octave 4 - note C_, 4 + C_ 4 notetype 12, 14, 7 - note D_, 8 + D_ 8 notetype 12, 9, 5 octave 2 - note D_, 6 - note D_, 1 - note F#, 1 - note G_, 16 + D_ 6 + D_ 1 + F# 1 + G_ 16 callchannel Music_TitleScreen_branch_7e622 octave 2 - note A_, 2 - note F_, 6 + A_ 2 + F_ 6 callchannel Music_TitleScreen_branch_7e62c octave 3 - note C_, 2 + C_ 2 octave 2 - note A_, 6 - note B_, 6 - note G_, 2 - note F_, 8 + A_ 6 + B_ 6 + G_ 2 + F_ 8 callchannel Music_TitleScreen_branch_7e622 notetype 8, 9, 5 octave 2 - note G_, 4 - note F_, 5 - note A_, 3 + G_ 4 + F_ 5 + A_ 3 notetype 8, 14, 6 octave 4 - note F_, 4 - note E_, 4 - note F_, 4 + F_ 4 + E_ 4 + F_ 4 notetype 12, 14, 7 - note G_, 6 - note A#, 2 - note G_, 8 + G_ 6 + A# 2 + G_ 8 vibrato 16, 2, 6 duty 3 notetype 12, 0, 11 - note G_, 8 + G_ 8 notetype 12, 14, 7 - note A_, 8 + A_ 8 duty 1 notetype 12, 14, 7 - note A#, 6 - note F_, 2 - note F_, 8 + A# 6 + F_ 2 + F_ 8 octave 3 - note D_, 8 + D_ 8 octave 4 - note A#, 4 - note B_, 4 + A# 4 + B_ 4 octave 5 - note C_, 6 + C_ 6 octave 4 - note G_, 2 - note G_, 8 + G_ 2 + G_ 8 octave 3 - note E_, 8 + E_ 8 notetype 12, 13, 7 octave 5 - note C_, 4 - note C#, 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e636 rest 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 notetype 8, 14, 5 octave 5 - note C_, 4 - note C_, 4 - note C#, 4 + C_ 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e636 - note D_, 1 + D_ 1 rest 2 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 notetype 8, 14, 3 octave 5 - note C_, 4 - note C_, 4 + C_ 4 + C_ 4 octave 4 - note B_, 4 + B_ 4 loopchannel 0, Music_TitleScreen_branch_7e594 Music_TitleScreen_branch_7e622:: notetype 12, 14, 7 octave 3 - note G_, 6 - note B_, 2 + G_ 6 + B_ 2 octave 4 - note D_, 8 + D_ 8 notetype 12, 9, 5 endchannel Music_TitleScreen_branch_7e62c:: notetype 12, 14, 7 octave 4 - note F_, 6 - note E_, 1 - note D#, 1 - note D_, 8 + F_ 6 + E_ 1 + D# 1 + D_ 8 notetype 12, 9, 5 endchannel Music_TitleScreen_branch_7e636:: notetype 12, 14, 1 - note D_, 1 + D_ 1 rest 2 octave 4 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 rest 3 - note D_, 1 + D_ 1 endchannel Music_TitleScreen_Ch3:: ; 7e643 (1f:6643) notetype 12, 1, 0 octave 3 - note G_, 1 + G_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 5 - note G_, 1 - note G_, 1 - note G_, 1 + G_ 1 + G_ 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 - note G_, 1 + G_ 1 rest 3 notetype 8, 1, 0 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note A_, 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + F_ 2 + A_ 2 Music_TitleScreen_branch_7e65e:: callchannel Music_TitleScreen_branch_7e6c9 @@ -359,102 +359,102 @@ Music_TitleScreen_branch_7e664:: callchannel Music_TitleScreen_branch_7e6d0 loopchannel 3, Music_TitleScreen_branch_7e664 callchannel Music_TitleScreen_branch_7e6c9 - note G_, 6 - note D_, 3 - note A_, 6 - note F_, 3 - note A_, 3 - note F_, 3 + G_ 6 + D_ 3 + A_ 6 + F_ 3 + A_ 3 + F_ 3 callchannel Music_TitleScreen_branch_7e6d7 - note A#, 3 - note F_, 3 + A# 3 + F_ 3 callchannel Music_TitleScreen_branch_7e6d7 - note B_, 3 - note G_, 3 + B_ 3 + G_ 3 callchannel Music_TitleScreen_branch_7e6dc octave 4 - note C_, 3 + C_ 3 octave 3 - note G_, 3 + G_ 3 callchannel Music_TitleScreen_branch_7e6dc octave 4 - note C#, 3 + C# 3 octave 3 - note A_, 3 + A_ 3 callchannel Music_TitleScreen_branch_7e6e5 octave 5 pitchbend 0, 66 - note D_, 4 + D_ 4 rest 4 octave 6 pitchbend 0, 50 - note D_, 4 + D_ 4 octave 5 pitchbend 0, 66 - note D_, 4 + D_ 4 rest 2 notetype 8, 1, 0 octave 4 - note C_, 4 - note C_, 4 - note C#, 4 + C_ 4 + C_ 4 + C# 4 callchannel Music_TitleScreen_branch_7e6e5 octave 6 pitchbend 0, 50 - note D_, 4 + D_ 4 rest 4 octave 5 pitchbend 0, 66 - note D_, 4 + D_ 4 rest 6 notetype 8, 1, 0 octave 4 - note C_, 4 - note C_, 4 + C_ 4 + C_ 4 octave 3 - note B_, 4 + B_ 4 loopchannel 0, Music_TitleScreen_branch_7e65e Music_TitleScreen_branch_7e6c9:: - note G_, 6 - note D_, 3 - note G_, 6 - note D_, 3 - note G_, 3 - note D_, 3 + G_ 6 + D_ 3 + G_ 6 + D_ 3 + G_ 3 + D_ 3 endchannel Music_TitleScreen_branch_7e6d0:: - note F_, 6 - note C_, 3 - note F_, 6 - note C_, 3 - note F_, 3 - note C_, 3 + F_ 6 + C_ 3 + F_ 6 + C_ 3 + F_ 3 + C_ 3 endchannel Music_TitleScreen_branch_7e6d7:: - note A#, 6 - note F_, 3 - note A#, 6 - note F_, 3 + A# 6 + F_ 3 + A# 6 + F_ 3 endchannel Music_TitleScreen_branch_7e6dc:: octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 3 + G_ 3 octave 4 - note C_, 6 + C_ 6 octave 3 - note G_, 3 + G_ 3 endchannel Music_TitleScreen_branch_7e6e5:: notetype 12, 1, 0 octave 4 - note D_, 1 + D_ 1 rest 5 endchannel @@ -462,217 +462,217 @@ Music_TitleScreen_branch_7e6e5:: Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb) dspeed 6 rest 4 - dnote 1, snare3 - dnote 1, snare3 - dnote 1, snare4 - dnote 1, snare4 + snare3 1 + snare3 1 + snare4 1 + snare4 1 dspeed 12 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare2 - dnote 1, snare2 + snare2 1 + snare2 1 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 dspeed 8 - dnote 2, snare3 - dnote 2, snare4 - dnote 2, snare2 - dnote 2, snare3 - dnote 2, snare2 - dnote 2, snare1 + snare3 2 + snare4 2 + snare2 2 + snare3 2 + snare2 2 + snare1 2 Music_TitleScreen_branch_7e716:: dspeed 12 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare2 - dnote 1, snare3 + snare2 1 + snare2 1 + snare3 1 rest 3 callchannel Music_TitleScreen_branch_7e834 callchannel Music_TitleScreen_branch_7e834 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare2 - dnote 1, snare3 + snare2 1 + snare2 1 + snare3 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 + snare3 1 + snare2 1 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 1 - dnote 1, snare2 + snare2 1 rest 1 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 1 dspeed 6 - dnote 1, snare3 - dnote 1, snare3 - dnote 1, snare4 - dnote 1, snare4 + snare3 1 + snare3 1 + snare4 1 + snare4 1 dspeed 12 callchannel Music_TitleScreen_branch_7e834 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 + snare3 1 + snare2 1 callchannel Music_TitleScreen_branch_7e834 callchannel Music_TitleScreen_branch_7e842 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 1 - dnote 1, snare4 - dnote 1, snare3 - dnote 1, snare2 + snare4 1 + snare3 1 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare4 - dnote 1, snare2 + snare2 1 + snare4 1 + snare2 1 rest 1 dspeed 6 - dnote 1, snare3 - dnote 1, snare3 - dnote 1, snare4 - dnote 1, snare4 + snare3 1 + snare3 1 + snare4 1 + snare4 1 dspeed 12 - dnote 1, snare1 + snare1 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare1 + snare3 1 + snare2 1 + snare1 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare3 + snare3 1 + snare2 1 + snare3 1 rest 3 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare4 + snare2 1 + snare3 1 + snare4 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 3 - dnote 1, snare3 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 3 - dnote 1, snare5 + snare5 1 rest 5 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare1 + snare3 1 + snare2 1 + snare1 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 1 - dnote 1, snare1 + snare1 1 rest 1 dspeed 8 - dnote 4, snare2 - dnote 4, snare3 - dnote 4, snare1 + snare2 4 + snare3 4 + snare1 4 dspeed 12 - dnote 1, snare5 + snare5 1 rest 5 - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare3 + snare3 1 + snare2 1 + snare3 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare1 + snare2 1 + snare3 1 + snare1 1 rest 1 - dnote 1, snare3 - dnote 1, snare2 + snare3 1 + snare2 1 dspeed 8 - dnote 4, snare2 - dnote 4, snare3 - dnote 4, snare2 + snare2 4 + snare3 4 + snare2 4 loopchannel 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare2 - dnote 1, snare3 - dnote 1, snare2 + snare2 1 + snare3 1 + snare2 1 rest 3 endchannel Music_TitleScreen_branch_7e842:: - dnote 1, snare2 + snare2 1 rest 3 - dnote 1, snare2 + snare2 1 rest 5 - dnote 1, snare3 - dnote 1, snare2 - dnote 1, snare2 + snare3 1 + snare2 1 + snare2 1 rest 3 endchannel -; 0x7e850
\ No newline at end of file +; 0x7e850 diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 2e4bcdaf..52642fdc 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,651 +1,651 @@ Music_TrainerBattle_Ch1:: ; 22919 (8:6919) - tempo 0, 112 - stereopanning 119 + tempo 112 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 2 rest 8 octave 3 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 4 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 2 - note C#, 2 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 4 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 2 - note C#, 2 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + C_ 1 + octave 2 + B_ 1 + octave 3 + C_ 1 + octave 2 + B_ 1 + A# 1 + B_ 1 + A# 1 + A_ 1 + A# 1 + octave 3 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 4 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 2 + C# 2 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 4 + D_ 6 + E_ 6 + F_ 4 + D_ 2 + E_ 4 + F_ 6 + C_ 2 + C# 2 Music_TrainerBattle_branch_22962:: notetype 12, 11, 5 - note D_, 2 - note E_, 4 - note C#, 2 - note D_, 4 - octave 2 - note B_, 4 - note F#, 4 - octave 3 - note E_, 2 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - note F_, 8 + D_ 2 + E_ 4 + C# 2 + D_ 4 + octave 2 + B_ 4 + F# 4 + octave 3 + E_ 2 + D_ 4 + C# 2 + D_ 2 + E_ 2 + F_ 8 notetype 12, 11, 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C_ 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C_ 1 notetype 12, 11, 5 - note D_, 2 - note E_, 4 - note C#, 2 - note D_, 4 + D_ 2 + E_ 4 + C# 2 + D_ 4 octave 2 - note B_, 4 - note F#, 4 + B_ 4 + F# 4 octave 3 - note E_, 2 - note D_, 4 - note C#, 2 + E_ 2 + D_ 4 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 + C# 2 notetype 12, 10, 7 - note D_, 8 - note C#, 8 + D_ 8 + C# 8 octave 2 - note B_, 8 + B_ 8 octave 3 - note C#, 8 + C# 8 notetype 12, 11, 5 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 rest 2 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 rest 2 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 2 - note E_, 4 + C# 2 + E_ 4 octave 2 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note C#, 1 - note D_, 4 + C# 1 + D_ 4 octave 2 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F# 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note C#, 4 + C# 4 octave 2 - note G_, 1 - note A_, 1 - note B_, 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note C#, 1 - note D_, 4 + C# 1 + D_ 4 octave 2 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F# 1 + G_ 1 + A_ 1 + B_ 1 octave 3 - note D_, 2 - note C#, 2 + D_ 2 + C# 2 octave 2 - note B_, 2 - note A_, 2 - note G_, 2 + B_ 2 + A_ 2 + G_ 2 rest 2 octave 3 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 2 - note B_, 2 - note G_, 2 - octave 3 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 + D_ 2 + C# 2 + octave 2 + B_ 2 + A_ 2 + B_ 2 + G_ 2 + octave 3 + D_ 2 + E_ 2 + F# 2 + G_ 2 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + A_ 2 rest 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + A_ 2 + B_ 2 + A_ 2 + G_ 2 + F# 2 + G_ 2 + A_ 2 + E_ 2 + G_ 2 + F# 2 + octave 2 + B_ 1 + octave 3 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note B_, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + octave 3 + B_ 1 + A# 1 + B_ 1 octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - octave 3 - note A_, 4 + C_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + octave 3 + A_ 4 octave 4 - note D_, 4 - octave 3 - note A_, 2 - note D_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A#, 1 - note B_, 2 + D_ 4 + octave 3 + A_ 2 + D_ 1 + E_ 1 + F# 1 + G_ 1 + G# 1 + A# 1 + B_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 2 + C_ 2 octave 3 - note G_, 2 - note B_, 2 - note F_, 2 - note G_, 2 - note A_, 2 + G_ 2 + B_ 2 + F_ 2 + G_ 2 + A_ 2 octave 4 - note C_, 2 - note D_, 2 + C_ 2 + D_ 2 rest 2 octave 3 - note A_, 4 + A_ 4 octave 4 - note C_, 4 - note D_, 2 + C_ 4 + D_ 2 octave 3 - note F_, 1 - note G_, 1 - note A_, 1 - note B_, 1 + F_ 1 + G_ 1 + A_ 1 + B_ 1 octave 4 - note C_, 1 - note D_, 1 - note E_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 + C_ 1 + D_ 1 + E_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + D_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 + F_ 2 + E_ 2 octave 3 - note B_, 2 - note C_, 2 + B_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note C_, 2 - note E_, 2 - note D_, 2 + C_ 2 + E_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note D_, 2 - note F_, 2 - note C_, 2 + D_ 2 + F_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note C_, 2 + E_ 2 + C_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note C_, 2 - note E_, 2 - note D_, 2 + C_ 2 + E_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 - note D_, 2 + F_ 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note D_, 2 - note F_, 2 - note D_, 16 - note C_, 16 + D_ 2 + F_ 2 + D_ 16 + C_ 16 octave 2 - note A#, 16 - note G_, 12 + A# 16 + G_ 12 octave 3 - note D_, 1 - note E_, 1 - note G_, 1 + D_ 1 + E_ 1 + G_ 1 octave 4 - note C_, 1 - note D_, 8 - note F_, 8 + C_ 1 + D_ 8 + F_ 8 octave 3 - note A#, 8 + A# 8 octave 4 - note C_, 8 - note D_, 8 - note E_, 8 - note F_, 8 - note G_, 8 - note E_, 2 + C_ 8 + D_ 8 + E_ 8 + F_ 8 + G_ 8 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 4 - note E_, 2 + E_ 2 rest 2 octave 3 - note C_, 2 - note D_, 4 + C_ 2 + D_ 4 octave 2 - note B_, 2 + B_ 2 octave 3 - note C#, 4 + C# 4 rest 2 - note C#, 1 - note D_, 1 - note E_, 1 + C# 1 + D_ 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 2 - note B_, 1 + B_ 1 rest 1 octave 3 - note C#, 1 + C# 1 rest 9 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 rest 5 - note C#, 1 - note D_, 1 - note E_, 1 + C# 1 + D_ 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D_, 2 - note E_, 2 - note F_, 2 - note G_, 2 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 + D_ 2 + E_ 2 + F_ 2 + G_ 2 + D# 1 + E_ 1 + F_ 1 + F# 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 rest 9 - note F#, 2 - note E_, 4 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note E_, 8 - note F#, 8 - note G_, 8 + F# 2 + E_ 4 + D# 2 + E_ 2 + F# 2 + G# 2 + E_ 8 + F# 8 + G_ 8 octave 4 - note C_, 4 + C_ 4 octave 3 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 + G_ 1 + G# 1 + A_ 1 + A# 1 loopchannel 0, Music_TrainerBattle_branch_22962 @@ -654,302 +654,302 @@ Music_TrainerBattle_Ch2:: ; 22bae (8:6bae) vibrato 10, 2, 5 notetype 12, 12, 2 octave 4 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note A_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note A_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note A_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note A_, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note A_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note A_, 1 - note C_, 1 - note C#, 1 - note C_, 1 - note A_, 1 - octave 3 - note B_, 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + A_ 1 + F_ 1 + F# 1 + F_ 1 + A_ 1 + E_ 1 + F_ 1 + E_ 1 + A_ 1 + D# 1 + E_ 1 + D# 1 + A_ 1 + D_ 1 + D# 1 + D_ 1 + A_ 1 + C# 1 + D_ 1 + C# 1 + A_ 1 + C_ 1 + C# 1 + C_ 1 + A_ 1 + octave 3 + B_ 1 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 + B_ 1 notetype 12, 14, 1 octave 4 - note B_, 16 + B_ 16 rest 16 notetype 12, 13, 1 - note B_, 16 + B_ 16 rest 12 - note A_, 4 + A_ 4 notetype 12, 12, 2 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 6 - note D_, 4 + C# 6 + D_ 4 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 4 - note D_, 6 - note A_, 2 - note A#, 2 - note B_, 6 + C# 4 + D_ 6 + A_ 2 + A# 2 + B_ 6 octave 5 - note C#, 6 - note D_, 4 + C# 6 + D_ 4 octave 4 - note B_, 2 + B_ 2 octave 5 - note C#, 4 - note D_, 6 + C# 4 + D_ 6 octave 4 - note A_, 4 + A_ 4 Music_TrainerBattle_branch_22bfc:: notetype 12, 12, 7 octave 3 - note B_, 6 - note F#, 14 - note B_, 4 - note F#, 4 - note B_, 4 + B_ 6 + F# 14 + B_ 4 + F# 4 + B_ 4 notetype 12, 5, 0 octave 4 - note C_, 8 + C_ 8 notetype 12, 3, 0 - note C_, 8 + C_ 8 notetype 12, 4, 14 - note C_, 8 + C_ 8 notetype 12, 12, 7 - note C_, 8 + C_ 8 octave 3 - note B_, 6 - note F#, 14 - note B_, 4 - note F#, 4 - note B_, 4 + B_ 6 + F# 14 + B_ 4 + F# 4 + B_ 4 notetype 12, 9, 0 - note A_, 8 + A_ 8 notetype 12, 5, 0 - note A_, 8 + A_ 8 notetype 12, 4, 0 - note A_, 8 + A_ 8 notetype 12, 3, 0 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note G_, 16 + G_ 16 octave 4 - note D_, 8 + D_ 8 octave 3 - note G_, 8 + G_ 8 notetype 12, 8, 0 - note A_, 8 + A_ 8 notetype 12, 5, 0 - note A_, 8 + A_ 8 notetype 12, 4, 0 - note A_, 8 + A_ 8 notetype 12, 6, 0 - note A_, 8 + A_ 8 notetype 12, 12, 7 - note G_, 16 + G_ 16 octave 4 - note E_, 8 - note F#, 8 - note E_, 16 + E_ 8 + F# 8 + E_ 16 notetype 12, 12, 5 - note G_, 4 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 + G_ 4 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + E_ 2 notetype 12, 11, 7 - note F#, 8 + F# 8 notetype 12, 5, 0 - note F#, 8 + F# 8 notetype 12, 6, 0 - note F#, 8 + F# 8 notetype 12, 7, 0 - note F#, 8 + F# 8 notetype 12, 10, 0 - note G_, 8 + G_ 8 notetype 12, 10, 7 - note G_, 8 + G_ 8 notetype 12, 11, 7 - note G_, 4 + G_ 4 notetype 12, 12, 5 - note A_, 2 - note G_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 + A_ 2 + G_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 notetype 12, 10, 0 - note G#, 8 + G# 8 notetype 12, 7, 0 - note G#, 8 + G# 8 notetype 12, 8, 0 - note G#, 8 + G# 8 notetype 12, 6, 0 - note G#, 8 + G# 8 notetype 12, 10, 0 - note A_, 16 + A_ 16 notetype 12, 11, 0 octave 5 - note C#, 8 - note E_, 8 + C# 8 + E_ 8 notetype 12, 12, 0 - note D_, 4 + D_ 4 octave 4 - note A_, 4 + A_ 4 octave 5 - note C_, 2 + C_ 2 notetype 12, 12, 7 octave 4 - note B_, 8 + B_ 8 notetype 12, 6, 0 - note B_, 8 + B_ 8 notetype 12, 6, 9 - note B_, 6 + B_ 6 notetype 12, 9, 6 - note B_, 6 + B_ 6 rest 2 notetype 12, 12, 0 octave 5 - note D_, 4 + D_ 4 octave 4 - note A_, 4 - note A#, 2 + A_ 4 + A# 2 notetype 12, 11, 0 octave 5 - note F_, 14 + F_ 14 notetype 12, 6, 0 - note G_, 16 + G_ 16 notetype 12, 5, 0 - note E_, 16 + E_ 16 notetype 12, 4, 0 - note E_, 16 + E_ 16 notetype 12, 12, 7 octave 4 - note C_, 6 + C_ 6 octave 3 - note A_, 14 + A_ 14 octave 4 - note C_, 4 + C_ 4 octave 3 - note A_, 4 + A_ 4 octave 4 - note C_, 4 + C_ 4 octave 3 - note A#, 6 + A# 6 octave 4 - note F_, 14 + F_ 14 octave 3 - note A#, 4 + A# 4 octave 4 - note F_, 4 - note D_, 4 - note C_, 6 + F_ 4 + D_ 4 + C_ 6 octave 3 - note A_, 14 + A_ 14 octave 4 - note C_, 4 - note E_, 2 - note D_, 2 - note C_, 2 - note E_, 2 - note D_, 2 - octave 3 - note A#, 4 + C_ 4 + E_ 2 + D_ 2 + C_ 2 + E_ 2 + D_ 2 + octave 3 + A# 4 octave 4 - note F_, 10 - note G_, 6 - note F_, 6 - note D_, 4 + F_ 10 + G_ 6 + F_ 6 + D_ 4 notetype 12, 11, 0 - note F_, 16 - note E_, 16 - note D_, 16 - note E_, 16 + F_ 16 + E_ 16 + D_ 16 + E_ 16 notetype 12, 10, 0 octave 5 - note F_, 16 - note E_, 16 - note G_, 16 - note F_, 16 + F_ 16 + E_ 16 + G_ 16 + F_ 16 notetype 12, 13, 1 octave 3 - note A#, 6 - note A#, 6 - note A#, 4 - note A_, 6 - note A_, 6 - note A_, 4 + A# 6 + A# 6 + A# 4 + A_ 6 + A_ 6 + A_ 4 octave 4 - note C_, 6 - note C_, 6 - note C_, 4 + C_ 6 + C_ 6 + C_ 4 octave 3 - note A#, 6 - note A#, 6 - note A_, 4 + A# 6 + A# 6 + A_ 4 notetype 12, 12, 7 - note A_, 4 - note B_, 4 - note G_, 2 - note A_, 10 - note B_, 2 + A_ 4 + B_ 4 + G_ 2 + A_ 10 + B_ 2 octave 4 - note C#, 2 - note E_, 2 - note D_, 2 - note C#, 2 + C# 2 + E_ 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A#, 16 + B_ 2 + A# 16 rest 2 - note A#, 2 + A# 2 octave 4 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - octave 3 - note A#, 2 - note B_, 16 + C_ 2 + F_ 2 + E_ 2 + D_ 2 + C_ 2 + octave 3 + A# 2 + B_ 16 rest 2 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 + C# 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C_, 16 - note E_, 8 - note G_, 8 + C_ 16 + E_ 8 + G_ 8 loopchannel 0, Music_TrainerBattle_branch_22bfc @@ -957,902 +957,902 @@ Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10) vibrato 0, 2, 0 notetype 12, 1, 4 octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 + B_ 1 + A# 1 + A_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + C_ 1 octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 2 - note A#, 2 - note B_, 2 - note B_, 2 + B_ 1 + A# 1 + B_ 1 + A# 1 + A_ 1 + G# 1 + A_ 2 + A# 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 - note E_, 2 - note D_, 2 + F_ 2 + E_ 2 + D_ 2 octave 2 - note B_, 2 - note B_, 2 + B_ 2 + B_ 2 octave 3 - note D_, 2 - note E_, 2 + D_ 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note C_, 2 + C_ 2 Music_TrainerBattle_branch_22d9c:: octave 2 - note A#, 1 - note B_, 1 + A# 1 + B_ 1 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + A_ 2 + G_ 2 + F# 2 + E_ 2 + D_ 2 + C_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 + E_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 octave 2 - note A_, 2 - note G#, 2 - note G_, 2 + A_ 2 + G# 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 - note G#, 2 - note A_, 2 + G_ 2 + G# 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 + G_ 2 octave 3 - note D_, 2 + D_ 2 octave 2 - note G_, 2 - note G#, 2 - note A_, 2 + G_ 2 + G# 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note D_, 2 - note C#, 2 + E_ 2 + D_ 2 + C# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note F#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note D#, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 4 + F# 2 + D_ 2 + E_ 2 + F# 2 + E_ 2 + D_ 2 + F# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + D# 2 + F_ 2 + G_ 2 + F_ 2 + D# 2 + G_ 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + E_ 2 + F# 2 + G# 2 + F# 2 + E_ 2 + G# 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + D_ 2 + A_ 2 + F_ 2 + G_ 2 + A_ 2 + G_ 2 + F_ 2 + E_ 2 + D_ 4 octave 2 - note A_, 4 + A_ 4 octave 3 - note C_, 2 - note G_, 2 + C_ 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 + G_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note G_, 2 - note D_, 4 + G_ 2 + D_ 4 octave 2 - note A_, 4 - note A#, 2 + A_ 4 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note F_, 4 + F_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note D_, 4 + D_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A#, 4 + A# 4 octave 3 - note E_, 4 + E_ 4 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 octave 2 - note B_, 2 - note A_, 2 + B_ 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note E_, 2 + E_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note F_, 2 + F_ 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 + F# 2 octave 2 - note B_, 2 + B_ 2 octave 3 - note F#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 + F# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + F# 2 + E_ 2 + F# 2 + E_ 2 + D_ 2 + C_ 2 loopchannel 0, Music_TrainerBattle_branch_22d9c -; 0x23099
\ No newline at end of file +; 0x23099 diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index ee73de3f..fb51fd15 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -1,339 +1,339 @@ Music_UnusedSong_Ch1:: ; a913 (2:6913) - tempo 0, 144 - stereopanning 119 + tempo 144 + volume 7, 7 vibrato 5, 1, 6 Music_UnusedSong_branch_a91b:: notetype 12, 1, 0 octave 6 - note E_, 1 + E_ 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note E_, 1 + E_ 1 rest 4 - note E_, 2 + E_ 2 rest 2 - note D#, 1 + D# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note D#, 1 + D# 1 rest 8 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 octave 5 - note B_, 1 + B_ 1 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 octave 5 - note B_, 1 + B_ 1 rest 2 octave 6 - note D#, 4 - note C#, 4 - note D#, 1 - note E_, 1 + D# 4 + C# 4 + D# 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 5 - note B_, 2 + B_ 2 rest 1 octave 6 - note E_, 1 + E_ 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note E_, 1 + E_ 1 rest 8 - note D#, 1 + D# 1 rest 1 octave 5 - note B_, 1 + B_ 1 rest 1 octave 6 - note C#, 1 + C# 1 rest 1 octave 5 - note B_, 1 + B_ 1 octave 6 - note D#, 1 + D# 1 rest 4 octave 5 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 octave 5 - note B_, 1 + B_ 1 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 + F# 4 + E_ 4 + F# 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 2 + D# 2 rest 3 octave 5 - note A_, 2 + A_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 2 + C# 2 rest 2 - note E_, 2 - note F#, 8 + E_ 2 + F# 8 rest 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 rest 2 octave 5 - note G#, 2 + G# 2 rest 2 - note A_, 2 + A_ 2 rest 2 - note B_, 2 + B_ 2 rest 2 octave 6 - note D#, 2 - note E_, 8 + D# 2 + E_ 8 rest 2 - note D#, 2 - note C#, 2 - note D#, 2 + D# 2 + C# 2 + D# 2 octave 5 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 1 - note B_, 1 + A_ 2 + G# 2 + A_ 2 + A# 1 + B_ 1 rest 4 - note F#, 2 + F# 2 rest 2 - note B_, 2 - note A#, 2 - note B_, 2 + B_ 2 + A# 2 + B_ 2 octave 6 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 rest 8 octave 5 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 + F# 2 + F_ 2 + F# 2 + G# 2 + A_ 2 octave 6 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 octave 5 - note B_, 2 + B_ 2 rest 6 - note B_, 2 + B_ 2 rest 6 loopchannel 0, Music_UnusedSong_branch_a91b endchannel Music_UnusedSong_Ch2:: ; a9cf (2:69cf) - tempo 0, 144 - stereopanning 119 - togglecall + tempo 144 + volume 7, 7 + toggleperfectpitch vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8:: notetype 12, 1, 0 octave 6 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 rest 8 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 - note F#, 1 + G# 1 + F# 1 rest 4 octave 5 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 + F# 4 + E_ 4 + F# 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 2 + D# 2 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 - note G#, 1 + A_ 1 + G# 1 rest 4 - note E_, 2 + E_ 2 rest 2 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 - note F#, 1 + G# 1 + F# 1 rest 8 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 - note F#, 1 + E_ 1 + F# 1 rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 + F# 4 + E_ 4 + F# 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 2 + F# 2 rest 1 - note C#, 2 + C# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note E_, 2 + E_ 2 rest 2 - note G#, 2 + G# 2 rest 2 - note D#, 8 + D# 8 rest 2 - note E_, 2 - note D#, 2 - note C#, 2 + E_ 2 + D# 2 + C# 2 octave 5 - note B_, 2 + B_ 2 rest 2 octave 6 - note C#, 2 + C# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note F#, 2 + F# 2 rest 2 - note C#, 8 + C# 8 rest 2 - note D#, 2 - note C#, 2 + D# 2 + C# 2 octave 5 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 1 - note F#, 1 + B_ 2 + A_ 2 + G# 2 + A_ 2 + G# 1 + F# 1 rest 8 - note B_, 2 - note A#, 2 - note B_, 2 - note A_, 1 - note G#, 1 + B_ 2 + A# 2 + B_ 2 + A_ 1 + G# 1 rest 4 - note G#, 2 - rest 2 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 2 - note F#, 2 + G# 2 + rest 2 + F# 2 + F_ 2 + F# 2 + G# 2 + A_ 2 + E_ 2 + C# 2 + E_ 2 + F# 2 rest 6 - note D#, 2 + D# 2 rest 6 loopchannel 0, Music_UnusedSong_branch_a9d8 endchannel -; 0xaa6f
\ No newline at end of file +; 0xaa6f diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 4d358528..5dfd5702 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,113 +1,113 @@ Music_Vermilion_Ch1:: ; b9eb (2:79eb) - tempo 0, 156 - stereopanning 119 + tempo 156 + volume 7, 7 duty 3 vibrato 12, 3, 4 - togglecall + toggleperfectpitch Music_Vermilion_branch_b9f6:: notetype 12, 11, 5 octave 3 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note A_, 4 - note F#, 1 - note G#, 1 - note A_, 2 - note E_, 4 - note C#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note A_, 4 - note F#, 1 - note G#, 1 - note A_, 2 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note F#, 4 - note E_, 4 - note F#, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note A_, 2 + E_ 4 + C# 1 + D_ 1 + E_ 2 + A_ 4 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + A_ 4 + F# 1 + G# 1 + A_ 2 + E_ 4 + C# 2 + E_ 2 + A_ 2 + G# 2 + B_ 2 + A_ 2 + G# 2 + E_ 2 + F# 2 + G# 2 + C# 2 + D_ 2 + E_ 2 + F# 2 + E_ 4 + C# 1 + D_ 1 + E_ 2 + A_ 4 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + A_ 4 + F# 1 + G# 1 + A_ 2 + E_ 4 + C# 1 + D_ 1 + E_ 2 + A_ 2 + G# 2 + F# 2 + A_ 2 + G# 2 + E_ 2 + F# 2 + G# 2 + F# 4 + E_ 4 + F# 2 + G# 2 + F# 2 + A_ 2 + G# 2 + B_ 2 + A_ 2 octave 4 - note C#, 2 - note D_, 2 - note C#, 2 + C# 2 + D_ 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 1 - note A_, 1 - note B_, 2 + B_ 2 + A_ 2 + G# 1 + A_ 1 + B_ 2 octave 4 - note C#, 2 - note E_, 2 + C# 2 + E_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note D_, 2 + D_ 2 octave 3 - note G#, 2 + G# 2 octave 4 - note C#, 2 + C# 2 octave 3 - note F#, 2 - note B_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 + F# 2 + B_ 2 + G# 2 + A_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + F# 2 + G# 2 + B_ 2 loopchannel 0, Music_Vermilion_branch_b9f6 @@ -118,63 +118,63 @@ Music_Vermilion_Ch2:: ; ba61 (2:7a61) Music_Vermilion_branch_ba66:: notetype 12, 12, 7 octave 3 - note A_, 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 - note A_, 1 - note B_, 1 + B_ 6 + A_ 1 + B_ 1 octave 4 - note C#, 8 + C# 8 octave 3 - note A_, 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 1 + C# 1 octave 3 - note B_, 1 - note A_, 8 - note A_, 8 + B_ 1 + A_ 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 - note A_, 1 - note B_, 1 + B_ 6 + A_ 1 + B_ 1 octave 4 - note C#, 8 + C# 8 octave 3 - note A_, 8 + A_ 8 octave 4 - note D_, 4 - note C#, 4 + D_ 4 + C# 4 octave 3 - note B_, 6 + B_ 6 octave 4 - note C#, 1 + C# 1 octave 3 - note B_, 1 - note A_, 8 - note B_, 4 + B_ 1 + A_ 8 + B_ 4 octave 4 - note C#, 4 - note D_, 4 - note E_, 4 - note F#, 8 - note B_, 8 - note A_, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note F#, 8 - note E_, 8 + C# 4 + D_ 4 + E_ 4 + F# 8 + B_ 8 + A_ 4 + G# 4 + F# 4 + E_ 4 + F# 8 + E_ 8 loopchannel 0, Music_Vermilion_branch_ba66 @@ -183,102 +183,102 @@ Music_Vermilion_Ch3:: ; baa6 (2:7aa6) Music_Vermilion_branch_baa8:: octave 4 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + E_ 2 + A_ 2 + E_ 2 + B_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + G# 2 + E_ 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + F# 2 + E_ 2 + G# 2 + E_ 2 + A_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + B_ 2 + E_ 2 + A_ 2 + E_ 2 + G# 2 + E_ 2 loopchannel 0, Music_Vermilion_branch_baa8 @@ -287,19 +287,19 @@ Music_Vermilion_Ch4:: ; bb0d (2:7b0d) Music_Vermilion_branch_bb0e:: callchannel Music_Vermilion_branch_bb3f - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 1 + triangle1 1 + triangle1 1 + triangle1 1 loopchannel 4, Music_Vermilion_branch_bb0e callchannel Music_Vermilion_branch_bb3f callchannel Music_Vermilion_branch_bb3f @@ -308,17 +308,17 @@ Music_Vermilion_branch_bb0e:: loopchannel 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 - dnote 2, triangle1 - dnote 1, triangle1 - dnote 1, triangle1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 + triangle1 2 + triangle1 1 + triangle1 1 endchannel -; 0xbb58
\ No newline at end of file +; 0xbb58 diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index b2b80e6e..70ce7d3f 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,302 +1,302 @@ Music_WildBattle_Ch1:: ; 23099 (8:7099) - tempo 0, 104 - stereopanning 119 + tempo 104 + volume 7, 7 duty 3 vibrato 6, 3, 4 - togglecall + toggleperfectpitch notetype 12, 11, 3 octave 4 - note C_, 1 + C_ 1 octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + B_ 1 + A# 1 + A_ 1 + A# 1 + A_ 1 + G# 1 + G_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note C_, 1 + C_ 1 octave 2 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 + B_ 1 + A# 1 + A_ 1 + A# 1 + B_ 1 octave 3 - note C_, 1 - note C#, 1 + C_ 1 + C# 1 notetype 12, 11, 1 - note G_, 6 - note E_, 6 - note D#, 12 - note C#, 14 - note E_, 6 - note D#, 10 + G_ 6 + E_ 6 + D# 12 + C# 14 + E_ 6 + D# 10 notetype 12, 4, 15 - note C#, 10 + C# 10 notetype 12, 11, 1 - note G_, 6 - note E_, 6 - note D#, 12 - note C#, 14 - note E_, 6 - note D#, 10 - note C#, 10 + G_ 6 + E_ 6 + D# 12 + C# 14 + E_ 6 + D# 10 + C# 10 Music_WildBattle_branch_230e0:: notetype 12, 11, 3 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + D_ 1 + C# 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + C_ 1 octave 2 - note B_, 1 + B_ 1 octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 + C_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + F_ 1 + E_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 + A_ 1 + G# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + D_ 1 + C# 1 + D_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + F# 1 + F_ 1 + E_ 1 + D# 1 + E_ 1 + F_ 1 + F# 1 + G_ 1 + G# 1 notetype 12, 11, 5 - note D_, 4 - note C_, 4 - note D_, 4 - note F_, 4 - note E_, 6 - note D_, 6 - note F_, 4 + D_ 4 + C_ 4 + D_ 4 + F_ 4 + E_ 6 + D_ 6 + F_ 4 notetype 12, 11, 7 - note A_, 16 - note G_, 16 + A_ 16 + G_ 16 notetype 12, 11, 5 - note D_, 4 - note C_, 4 - note D_, 4 - note F_, 4 - note G_, 6 - note A_, 6 - note B_, 4 + D_ 4 + C_ 4 + D_ 4 + F_ 4 + G_ 6 + A_ 6 + B_ 4 notetype 12, 11, 7 octave 4 - note C_, 16 + C_ 16 notetype 12, 3, 15 - note G_, 16 + G_ 16 notetype 12, 11, 5 octave 3 - note C_, 12 - note C_, 2 + C_ 12 + C_ 2 rest 2 - note D_, 2 - note C_, 2 + D_ 2 + C_ 2 rest 12 - note C#, 12 - note C#, 2 + C# 12 + C# 2 rest 2 - note F_, 2 + F_ 2 notetype 12, 10, 3 - note D#, 6 + D# 6 notetype 12, 10, 7 - note C#, 8 + C# 8 loopchannel 0, Music_WildBattle_branch_230e0 @@ -305,160 +305,160 @@ Music_WildBattle_Ch2:: ; 231d8 (8:71d8) vibrato 8, 2, 5 notetype 12, 12, 3 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 octave 4 - note G_, 1 - note F#, 1 - note F_, 1 + G_ 1 + F# 1 + F_ 1 octave 5 - note G_, 1 + G_ 1 notetype 12, 12, 2 octave 4 - note G_, 6 + G_ 6 octave 3 - note G_, 6 - note G_, 12 - note G_, 14 - note G_, 6 - note G_, 10 + G_ 6 + G_ 12 + G_ 14 + G_ 6 + G_ 10 notetype 12, 9, 0 - note F#, 10 + F# 10 notetype 12, 12, 2 - note G_, 6 - note G_, 6 - note G_, 12 - note G_, 14 - note G_, 6 - note G_, 10 - note G_, 10 + G_ 6 + G_ 6 + G_ 12 + G_ 14 + G_ 6 + G_ 10 + G_ 10 Music_WildBattle_branch_23225:: notetype 12, 12, 5 - note G_, 6 - note F#, 6 - note E_, 4 - note G_, 6 - note A_, 6 - note G_, 4 + G_ 6 + F# 6 + E_ 4 + G_ 6 + A_ 6 + G_ 4 octave 4 - note G#, 12 - note G_, 2 + G# 12 + G_ 2 rest 2 - note G#, 2 - note G_, 2 + G# 2 + G_ 2 rest 4 notetype 12, 11, 7 octave 5 - note C#, 8 + C# 8 notetype 12, 12, 5 octave 4 - note C_, 6 + C_ 6 octave 3 - note A#, 6 - note G#, 4 + A# 6 + G# 4 octave 4 - note C#, 6 - note C_, 6 + C# 6 + C_ 6 octave 3 - note A#, 4 + A# 4 octave 4 - note F_, 6 - note E_, 6 - note D_, 4 + F_ 6 + E_ 6 + D_ 4 notetype 12, 12, 7 octave 3 - note A#, 4 + A# 4 octave 4 - note C_, 4 - note D_, 4 - note F_, 4 + C_ 4 + D_ 4 + F_ 4 notetype 12, 12, 0 - note G#, 16 + G# 16 notetype 12, 11, 0 - note G#, 16 + G# 16 notetype 12, 4, 14 - note G_, 16 + G_ 16 notetype 12, 12, 7 - note G_, 16 + G_ 16 octave 3 - note F_, 8 - note A#, 8 + F_ 8 + A# 8 octave 4 - note D_, 8 - note F_, 8 + D_ 8 + F_ 8 notetype 12, 12, 0 - note E_, 16 + E_ 16 notetype 12, 12, 7 - note E_, 16 + E_ 16 octave 3 - note F_, 8 - note A#, 8 + F_ 8 + A# 8 octave 4 - note D_, 8 - note F_, 8 + D_ 8 + F_ 8 notetype 12, 12, 0 - note G_, 16 + G_ 16 notetype 12, 3, 15 octave 5 - note C_, 16 + C_ 16 notetype 12, 12, 5 octave 4 - note E_, 12 - note E_, 2 + E_ 12 + E_ 2 rest 2 - note F_, 2 + F_ 2 notetype 12, 12, 1 - note E_, 4 + E_ 4 notetype 12, 12, 5 rest 10 - note F_, 12 - note F_, 2 + F_ 12 + F_ 2 rest 2 - note G#, 2 + G# 2 notetype 12, 10, 3 - note G_, 6 + G_ 6 notetype 12, 12, 7 - note F_, 8 + F_ 8 loopchannel 0, Music_WildBattle_branch_23225 @@ -466,274 +466,274 @@ Music_WildBattle_Ch3:: ; 23290 (8:7290) vibrato 0, 2, 0 notetype 12, 1, 1 octave 4 - note C#, 1 + C# 1 rest 1 - note C#, 1 - note C_, 1 - note D_, 1 + C# 1 + C_ 1 + D_ 1 rest 1 - note D_, 1 - note C_, 1 - note D#, 1 + D_ 1 + C_ 1 + D# 1 rest 1 - note D#, 1 - note C_, 1 - note E_, 1 + D# 1 + C_ 1 + E_ 1 rest 1 - note E_, 1 - note C_, 1 - note F_, 1 + E_ 1 + C_ 1 + F_ 1 rest 1 - note F_, 1 - note C_, 1 - note F#, 1 + F_ 1 + C_ 1 + F# 1 rest 1 - note F#, 1 - note C_, 1 - note G_, 1 + F# 1 + C_ 1 + G_ 1 rest 1 - note G_, 1 - note C_, 1 + G_ 1 + C_ 1 octave 3 - note A#, 2 - note B_, 2 + A# 2 + B_ 2 Music_WildBattle_branch_232b5:: octave 4 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note A#, 2 - note G#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note A#, 2 - note G#, 2 - note F_, 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C# 2 + G# 2 + C# 4 + G# 2 + A# 2 + G# 2 + G_ 2 + C# 2 + G# 2 + C# 4 + G# 2 + A# 2 + G# 2 + F_ 2 loopchannel 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note G#, 12 - note G_, 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + G# 12 + G_ 2 rest 2 - note G#, 2 - note G_, 2 + G# 2 + G_ 2 rest 4 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 + F_ 2 + E_ 2 + D_ 2 + C# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 + F_ 2 octave 3 - note A#, 2 + A# 2 octave 4 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 + F_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + F_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C_ 2 + G_ 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 + C# 2 + G# 2 loopchannel 0, Music_WildBattle_branch_232d8 -; 0x233a6
\ No newline at end of file +; 0x233a6 diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm index eeff798b..5ef52491 100644 --- a/audio/music/yellow/meetjessiejames.asm +++ b/audio/music/yellow/meetjessiejames.asm @@ -1,310 +1,310 @@ -Music_MeetJessieJames_Ch1: ; 8316d (20:716d) - tempo 0, 144 - stereopanning 119 +Music_MeetJessieJames_Ch1:: ; 8316d (20:716d) + tempo 144 + volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 2 octave 3 - note G#, 1 - note G_, 1 - note F#, 2 - note F_, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 + G# 1 + G_ 1 + F# 2 + F_ 2 + E_ 2 + D# 2 + D_ 2 + C# 2 + C_ 2 notetype 12, 11, 6 - note D#, 12 - note C_, 4 + D# 12 + C_ 4 -Music_MeetJessieJames_branch_83187: +Music_MeetJessieJames_branch_83187:: notetype 12, 11, 2 octave 4 - note D_, 16 + D_ 16 rest 12 notetype 12, 11, 4 octave 3 - note A#, 4 + A# 4 rest 16 rest 8 notetype 12, 11, 2 octave 2 - note A_, 2 + A_ 2 octave 3 - note A#, 2 - note A_, 4 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note F_, 2 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 + A# 2 + A_ 4 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 octave 2 - note A#, 4 + A# 4 notetype 12, 11, 4 octave 3 - note B_, 4 + B_ 4 notetype 12, 11, 2 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - note F_, 2 - note D_, 1 - note D#, 1 - note D#, 2 - note D#, 2 - note D_, 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 + D# 2 + D_ 2 + D# 2 + F_ 2 + D_ 1 + D# 1 + D# 2 + D# 2 + D_ 2 octave 2 - note A#, 2 + A# 2 octave 3 - note B_, 2 + B_ 2 notetype 12, 11, 4 - note A#, 4 + A# 4 loopchannel 0, Music_MeetJessieJames_branch_83187 -Music_MeetJessieJames_Ch2: ; 831c8 (20:71c8) +Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8) duty 3 vibrato 6, 1, 5 notetype 12, 12, 2 octave 4 - note D_, 1 - note C#, 1 - note C_, 2 + D_ 1 + C# 1 + C_ 2 octave 3 - note B_, 2 - note A#, 2 - note A_, 2 - note G#, 2 - note G_, 2 - note F#, 2 + B_ 2 + A# 2 + A_ 2 + G# 2 + G_ 2 + F# 2 notetype 12, 12, 7 - note A_, 12 + A_ 12 octave 4 - note C#, 4 + C# 4 -Music_MeetJessieJames_branch_831df: +Music_MeetJessieJames_branch_831df:: notetype 12, 12, 2 octave 3 - note C#, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 octave 2 - note A_, 4 + A_ 4 notetype 12, 12, 5 octave 4 - note C#, 4 + C# 4 notetype 12, 12, 2 - note D_, 1 + D_ 1 octave 3 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C#, 2 + D_ 1 + D_ 2 + D_ 2 + C# 2 + D_ 2 + C# 2 + D_ 2 + E_ 2 + C# 1 + D_ 1 + D_ 2 + D_ 2 + C# 2 notetype 12, 12, 6 octave 4 - note D_, 8 + D_ 8 notetype 12, 12, 2 - note D#, 6 - note F_, 4 - note D#, 4 + D# 6 + F_ 4 + D# 4 octave 3 - note A#, 2 + A# 2 octave 4 - note D#, 6 - note F_, 4 - note D#, 2 + D# 6 + F_ 4 + D# 2 notetype 12, 12, 5 - note D_, 4 + D_ 4 notetype 12, 12, 2 - note D#, 6 - note F_, 4 - note D#, 4 + D# 6 + F_ 4 + D# 4 octave 3 - note A#, 2 + A# 2 octave 4 - note D#, 4 - note F_, 4 + D# 4 + F_ 4 notetype 12, 12, 5 - note D#, 8 + D# 8 loopchannel 0, Music_MeetJessieJames_branch_831df -Music_MeetJessieJames_Ch3: ; 8322a (20:722a) +Music_MeetJessieJames_Ch3:: ; 8322a (20:722a) notetype 12, 1, 0 rest 16 rest 8 octave 4 - note D_, 2 + D_ 2 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 2 - note D#, 2 + C_ 2 + D# 2 -Music_MeetJessieJames_branch_83235: - note D_, 1 +Music_MeetJessieJames_branch_83235:: + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A#, 2 - note A_, 2 - note D#, 2 - note D_, 1 + A# 2 + A_ 2 + D# 2 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note D_, 1 + D_ 1 rest 1 octave 3 - note A_, 2 + A_ 2 octave 4 - note C_, 2 - note D_, 2 - note D#, 1 + C_ 2 + D_ 2 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 octave 3 - note A#, 1 + A# 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note A#, 1 + A# 1 rest 1 - note D#, 1 + D# 1 rest 1 octave 3 - note A#, 1 + A# 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note E_, 1 + E_ 1 rest 1 loopchannel 0, Music_MeetJessieJames_branch_83235 endchannel -; 0x832ba
\ No newline at end of file +; 0x832ba diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm index 46bec7c3..1832bb03 100644 --- a/audio/music/yellow/surfingpikachu.asm +++ b/audio/music/yellow/surfingpikachu.asm @@ -1,691 +1,691 @@ -Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8) - tempo 0, 117 - stereopanning 119 +Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8) + tempo 117 + volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 3 octave 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note F#, 2 + F# 2 notetype 12, 11, 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note F#, 16 + F# 16 rest 2 notetype 12, 11, 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note A_, 2 + A_ 2 notetype 12, 11, 3 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note A_, 14 + A_ 14 notetype 12, 11, 2 - note D#, 2 - note C#, 1 - note D#, 1 + D# 2 + C# 1 + D# 1 octave 2 - note B_, 6 - octave 3 - note E_, 4 - note E_, 4 - note E_, 8 - note G#, 4 - note G#, 4 - note G#, 2 + B_ 6 + octave 3 + E_ 4 + E_ 4 + E_ 8 + G# 4 + G# 4 + G# 2 -Music_SurfingPikachu_branch_82d1a: +Music_SurfingPikachu_branch_82d1a:: notetype 12, 11, 3 octave 3 - note G#, 4 - note E_, 4 - note F#, 4 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 6 - note F#, 2 - note A_, 8 + G# 4 + E_ 4 + F# 4 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + F# 2 + E_ 2 + D# 2 + E_ 2 + D# 2 + C# 6 + F# 2 + A_ 8 octave 2 - note B_, 6 - octave 3 - note E_, 2 - note G#, 8 - note G#, 4 - note E_, 4 - note F#, 4 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 1 + B_ 6 + octave 3 + E_ 2 + G# 8 + G# 4 + E_ 4 + F# 4 + E_ 2 + A_ 2 + G# 2 + F# 2 + G# 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + G# 2 + F# 6 + E_ 2 + F# 1 rest 3 - note A_, 4 + A_ 4 duty 0 notetype 12, 11, 2 - note G#, 1 - note F#, 1 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note F#, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note B_, 1 - note A#, 1 - note B_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note A_, 2 - octave 4 - note C#, 2 - note C_, 2 - note C#, 3 - octave 3 - note F#, 1 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note E_, 3 - note E_, 1 - note B_, 2 - note A_, 2 - note G#, 6 - note E_, 1 - note F_, 1 - note F#, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note B_, 1 - note A#, 1 - note B_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G_, 2 - note G#, 2 - note A_, 2 - octave 4 - note C#, 2 - note C_, 2 - note C#, 3 - octave 3 - note F#, 1 - note A_, 2 - note G#, 2 - note A_, 2 - octave 4 - note D#, 2 - note E_, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 8 + G# 1 + F# 1 + G# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + E_ 2 + D# 2 + F# 2 + F# 2 + D# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + B_ 1 + A# 1 + B_ 2 + G# 2 + E_ 2 + G# 2 + G_ 2 + G# 2 + A_ 2 + octave 4 + C# 2 + C_ 2 + C# 3 + octave 3 + F# 1 + A_ 2 + G# 2 + F# 2 + A_ 2 + E_ 3 + E_ 1 + B_ 2 + A_ 2 + G# 6 + E_ 1 + F_ 1 + F# 2 + F# 2 + D# 2 + F# 2 + B_ 2 + A_ 2 + G# 2 + F# 2 + B_ 1 + A# 1 + B_ 2 + G# 2 + E_ 2 + G# 2 + G_ 2 + G# 2 + A_ 2 + octave 4 + C# 2 + C_ 2 + C# 3 + octave 3 + F# 1 + A_ 2 + G# 2 + A_ 2 + octave 4 + D# 2 + E_ 2 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 1 + D# 1 + E_ 8 duty 3 loopchannel 0, Music_SurfingPikachu_branch_82d1a -Music_SurfingPikachu_Ch2: ; 82d9d (20:6d9d) +Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d) duty 3 vibrato 6, 1, 5 notetype 12, 12, 4 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 12, 4 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 11, 2 octave 3 - note B_, 2 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note C#, 2 + C# 2 + D# 2 + C# 2 octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 + B_ 2 + A_ 2 + G# 2 + F# 2 notetype 12, 12, 4 octave 4 - note C#, 6 + C# 6 notetype 12, 12, 2 - note F#, 2 + F# 2 notetype 12, 12, 4 - note C#, 6 + C# 6 notetype 12, 12, 2 - note F#, 2 + F# 2 notetype 12, 11, 2 - note C#, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 + C# 2 + D# 2 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 2 + A_ 2 + G# 2 notetype 12, 12, 2 - note E_, 6 - note B_, 4 - note B_, 4 - note B_, 8 - note B_, 4 - note B_, 4 - note B_, 2 + E_ 6 + B_ 4 + B_ 4 + B_ 8 + B_ 4 + B_ 4 + B_ 2 -Music_SurfingPikachu_branch_82de0: +Music_SurfingPikachu_branch_82de0:: notetype 12, 12, 6 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 6 - note A_, 2 - note G#, 8 - note F#, 6 - note A_, 2 + B_ 6 + A_ 2 + G# 8 + F# 6 + A_ 2 octave 4 - note C#, 8 + C# 8 octave 3 - note E_, 6 - note G#, 2 - note B_, 8 + E_ 6 + G# 2 + B_ 8 octave 4 - note E_, 4 + E_ 4 octave 3 - note B_, 4 - note A_, 4 + B_ 4 + A_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 6 + B_ 6 octave 4 - note D#, 2 - note E_, 8 - note D#, 6 - note C#, 2 - note D#, 1 + D# 2 + E_ 8 + D# 6 + C# 2 + D# 1 rest 3 - note F#, 4 - note E_, 10 + F# 4 + E_ 10 notetype 12, 12, 6 duty 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 6 - octave 4 - note C#, 2 - note D#, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 6 - note F#, 2 - note G#, 8 - note A_, 6 - note G#, 2 - note A_, 4 - note F#, 4 - note G#, 10 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 6 - octave 4 - note C#, 2 - note D#, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 6 - note F#, 2 - note G#, 8 - note A_, 4 - note F#, 4 - note D#, 4 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 6 + octave 4 + C# 2 + D# 4 + octave 3 + B_ 4 + octave 4 + E_ 6 + F# 2 + G# 8 + A_ 6 + G# 2 + A_ 4 + F# 4 + G# 10 + E_ 2 + D# 2 + C# 2 + octave 3 + B_ 6 + octave 4 + C# 2 + D# 4 + octave 3 + B_ 4 + octave 4 + E_ 6 + F# 2 + G# 8 + A_ 4 + F# 4 + D# 4 octave 5 - note C#, 4 + C# 4 octave 4 - note B_, 8 + B_ 8 notetype 12, 12, 2 octave 5 - note E_, 4 + E_ 4 notetype 12, 12, 6 duty 3 octave 3 - note B_, 1 - note A#, 1 - note B_, 1 + B_ 1 + A# 1 + B_ 1 octave 4 - note C#, 1 + C# 1 loopchannel 0, Music_SurfingPikachu_branch_82de0 -Music_SurfingPikachu_Ch3: ; 82e45 (20:6e45) +Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45) notetype 12, 1, 0 octave 4 - note B_, 6 + B_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 6 + B_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 6 + A_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 6 + A_ 6 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G#, 1 + G# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 -Music_SurfingPikachu_branch_82ea0: - note E_, 1 +Music_SurfingPikachu_branch_82ea0:: + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 - note C_, 1 - note C#, 1 + C# 1 + C_ 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 - note D#, 1 - note E_, 1 + E_ 1 + D# 1 + E_ 1 rest 1 octave 4 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note B_, 1 - note A#, 1 - note B_, 1 + B_ 1 + A# 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D_, 1 + D_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note F#, 1 + F# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 loopchannel 0, Music_SurfingPikachu_branch_82ea0 -; 0x82fbe
\ No newline at end of file +; 0x82fbe diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm index ee716901..4d9cf938 100644 --- a/audio/music/yellow/yellowintro.asm +++ b/audio/music/yellow/yellowintro.asm @@ -1,485 +1,485 @@ -Music_YellowIntro_Ch1: ; 7f65c (1f:765c) - tempo 0, 116 - stereopanning 119 +Music_YellowIntro_Ch1:: ; 7f65c (1f:765c) + tempo 116 + volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 12, 11, 2 octave 3 - note G#, 2 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 3 - note A#, 1 - note B_, 2 - note B_, 10 + G# 2 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 4 + B_ 3 + A# 1 + B_ 2 + B_ 10 notetype 12, 11, 6 octave 4 - note C#, 1 - note C_, 1 - note C#, 10 + C# 1 + C_ 1 + C# 10 octave 3 - note G#, 1 - note G_, 1 - note G#, 4 - note B_, 4 - octave 4 - note E_, 4 - note F#, 8 - note E_, 8 + G# 1 + G_ 1 + G# 4 + B_ 4 + octave 4 + E_ 4 + F# 8 + E_ 8 octave 3 - note A_, 4 - note B_, 4 + A_ 4 + B_ 4 octave 4 - note C#, 4 + C# 4 octave 3 - note B_, 4 - note G#, 6 + B_ 4 + G# 6 notetype 12, 11, 2 - note B_, 2 + B_ 2 notetype 12, 11, 6 - note G#, 6 + G# 6 notetype 12, 11, 2 - note B_, 2 + B_ 2 notetype 12, 11, 6 octave 4 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note G#, 2 + G# 2 notetype 12, 11, 6 - note E_, 6 + E_ 6 notetype 12, 11, 2 - note G#, 2 + G# 2 notetype 12, 11, 6 octave 3 - note A_, 4 - note F#, 4 - note A_, 4 - note B_, 4 - note F#, 4 - note G#, 4 - note A_, 2 - note G#, 2 - note F#, 2 - note D#, 2 + A_ 4 + F# 4 + A_ 4 + B_ 4 + F# 4 + G# 4 + A_ 2 + G# 2 + F# 2 + D# 2 notetype 12, 11, 3 - note B_, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 2 - note C#, 2 - note F#, 4 - note F#, 3 - note D#, 1 - note F#, 2 - note F#, 8 + B_ 2 + octave 4 + E_ 4 + E_ 4 + E_ 4 + E_ 2 + C# 2 + F# 4 + F# 3 + D# 1 + F# 2 + F# 8 notetype 12, 11, 6 - note F#, 1 - note F_, 1 - note F#, 8 + F# 1 + F_ 1 + F# 8 octave 3 - note B_, 1 - note A#, 1 - note B_, 8 + B_ 1 + A# 1 + B_ 8 octave 4 - note F#, 1 - note F_, 1 - note F#, 2 + F# 1 + F_ 1 + F# 2 notetype 12, 11, 3 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 + F# 1 + E_ 1 + D# 1 + C# 1 notetype 12, 11, 2 octave 3 - note B_, 16 + B_ 16 endchannel -Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3) +Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3) duty 2 vibrato 6, 1, 5 notetype 12, 12, 2 octave 3 - note B_, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 3 - note D#, 1 - note E_, 2 - note E_, 4 + B_ 2 + octave 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 4 + E_ 3 + D# 1 + E_ 2 + E_ 4 notetype 12, 12, 5 - note G#, 1 - note G_, 1 - note G#, 10 + G# 1 + G_ 1 + G# 10 octave 3 - note B_, 1 - note A#, 1 - note B_, 6 + B_ 1 + A# 1 + B_ 6 notetype 12, 12, 7 octave 4 - note E_, 4 - note G#, 4 - note B_, 4 + E_ 4 + G# 4 + B_ 4 octave 5 - note C#, 16 + C# 16 octave 4 - note A_, 4 - note G#, 4 - note F#, 4 - note E_, 4 + A_ 4 + G# 4 + F# 4 + E_ 4 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 12, 7 octave 3 - note B_, 6 + B_ 6 notetype 12, 12, 2 octave 4 - note E_, 2 + E_ 2 notetype 12, 12, 7 - note G#, 6 + G# 6 notetype 12, 12, 2 - note B_, 2 + B_ 2 notetype 12, 12, 7 - note G#, 6 + G# 6 notetype 12, 12, 2 - note B_, 2 + B_ 2 notetype 12, 12, 7 - note C#, 4 + C# 4 octave 3 - note A_, 4 - octave 4 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 4 - note D#, 2 - note C#, 2 + A_ 4 + octave 4 + C# 4 + D# 4 + E_ 2 + D# 2 + C# 2 + D# 4 + D# 2 + C# 2 octave 3 - note B_, 2 + B_ 2 notetype 12, 12, 3 octave 4 - note E_, 2 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 2 - note F#, 2 - note A_, 4 - note A_, 3 - note F#, 1 - note A_, 2 - note A_, 4 + E_ 2 + G# 4 + G# 4 + G# 4 + G# 2 + F# 2 + A_ 4 + A_ 3 + F# 1 + A_ 2 + A_ 4 notetype 12, 12, 7 - note B_, 1 - note A#, 1 - note B_, 8 - note B_, 1 - note A#, 1 - note B_, 8 - note B_, 1 - note A#, 1 - note B_, 6 + B_ 1 + A# 1 + B_ 8 + B_ 1 + A# 1 + B_ 8 + B_ 1 + A# 1 + B_ 6 notetype 12, 12, 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 + B_ 1 + A_ 1 + G# 1 + F# 1 notetype 12, 12, 2 - note E_, 16 + E_ 16 endchannel -Music_YellowIntro_Ch3: ; 7f749 (1f:7749) +Music_YellowIntro_Ch3:: ; 7f749 (1f:7749) notetype 12, 1, 0 octave 4 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 3 - note B_, 1 + B_ 1 rest 1 octave 4 - note C#, 1 + C# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note F#, 1 + F# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note C#, 1 + C# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 1 octave 4 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note G#, 1 + G# 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note A_, 1 + A_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note E_, 1 + E_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note A_, 1 + A_ 1 rest 1 octave 5 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 + F# 1 rest 1 octave 5 - note C#, 1 + C# 1 rest 3 - note F#, 1 + F# 1 rest 1 octave 4 - note F#, 1 - note G#, 1 - note A_, 1 + F# 1 + G# 1 + A_ 1 octave 5 - note C#, 1 - note E_, 1 + C# 1 + E_ 1 rest 15 endchannel -; 0x7f860
\ No newline at end of file +; 0x7f860 diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm index 9c5c0aa6..e8c2a7ba 100644 --- a/audio/music/yellow/yellowunusedsong.asm +++ b/audio/music/yellow/yellowunusedsong.asm @@ -1,51 +1,51 @@ -Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe) - tempo 0, 140 - stereopanning 119 +Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe) + tempo 140 + volume 7, 7 duty 3 vibrato 8, 1, 4 notetype 8, 11, 2 octave 3 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 - note G_, 6 - note A_, 6 - note E_, 6 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note A_, 6 - note G_, 6 - note A_, 12 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + A_ 6 + G_ 6 + A_ 12 -Music_YellowUnusedSong_branch_82fde: - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 - note G_, 6 - note A_, 6 - note E_, 6 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 +Music_YellowUnusedSong_branch_82fde:: + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 octave 4 - note D#, 6 - note D_, 12 + D# 6 + D_ 12 rest 16 rest 16 rest 16 @@ -53,275 +53,275 @@ Music_YellowUnusedSong_branch_82fde: rest 16 rest 16 octave 3 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note G_, 6 - note G_, 6 - note A_, 6 - note E_, 6 - note A_, 6 - note A_, 2 - note A_, 2 - note A_, 2 - note A#, 6 - note A#, 6 - note A_, 6 - note G_, 6 - note A_, 12 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + G_ 6 + G_ 6 + A_ 6 + E_ 6 + A_ 6 + A_ 2 + A_ 2 + A_ 2 + A# 6 + A# 6 + A_ 6 + G_ 6 + A_ 12 loopchannel 0, Music_YellowUnusedSong_branch_82fde -Music_YellowUnusedSong_Ch2: ; 83010 (20:7010) +Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010) duty 2 notetype 8, 12, 2 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note C_, 6 - note D_, 6 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 octave 3 - note A_, 6 + A_ 6 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note D_, 6 - note A#, 6 - note A_, 12 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + D_ 6 + A# 6 + A_ 12 -Music_YellowUnusedSong_branch_8302a: - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note C_, 6 - note D_, 6 +Music_YellowUnusedSong_branch_8302a:: + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 octave 3 - note A_, 6 + A_ 6 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note G#, 6 - note G_, 12 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + G# 6 + G_ 12 notetype 8, 9, 0 octave 3 - note D#, 16 - note D#, 8 - note D#, 16 - note D#, 8 + D# 16 + D# 8 + D# 16 + D# 8 octave 2 - note A#, 16 - note A#, 8 + A# 16 + A# 8 octave 3 - note D#, 12 - note F_, 12 + D# 12 + F_ 12 notetype 8, 12, 2 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note C_, 6 - note C_, 6 - note D_, 6 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + C_ 6 + C_ 6 + D_ 6 octave 3 - note A_, 6 + A_ 6 octave 4 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D#, 6 - note D#, 6 - note D_, 6 - note A#, 6 - note A_, 12 + D_ 6 + D_ 2 + D_ 2 + D_ 2 + D# 6 + D# 6 + D_ 6 + A# 6 + A_ 12 loopchannel 0, Music_YellowUnusedSong_branch_8302a -Music_YellowUnusedSong_Ch3: ; 83068 (20:7068) +Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068) notetype 12, 1, 0 vibrato 2, 1, 5 rest 16 rest 12 octave 4 - note C_, 4 - note D_, 8 - note D#, 8 - note G_, 8 - note A#, 8 + C_ 4 + D_ 8 + D# 8 + G_ 8 + A# 8 -Music_YellowUnusedSong_branch_83075: - note A_, 8 - note A#, 8 - note G_, 8 - note A_, 4 - note D_, 4 - note A_, 8 - note A#, 8 +Music_YellowUnusedSong_branch_83075:: + A_ 8 + A# 8 + G_ 8 + A_ 4 + D_ 4 + A_ 8 + A# 8 octave 5 - note C#, 8 - note D_, 8 - note D#, 16 - note D#, 16 + C# 8 + D_ 8 + D# 16 + D# 16 octave 4 - note A#, 16 + A# 16 octave 5 - note D#, 8 - note F_, 8 + D# 8 + F_ 8 octave 4 - note D_, 16 - note D_, 16 + D_ 16 + D_ 16 octave 4 - note D_, 8 - note D#, 8 - note G_, 8 - note A#, 8 + D_ 8 + D# 8 + G_ 8 + A# 8 loopchannel 0, Music_YellowUnusedSong_branch_83075 -Music_YellowUnusedSong_Ch4: ; 83092 (20:7092) +Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092) dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 -Music_YellowUnusedSong_branch_830c3: - dnote 4, snare3 +Music_YellowUnusedSong_branch_830c3:: + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 2 + snare3 2 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 + snare3 4 dspeed 8 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 + snare3 2 + snare3 2 + snare3 2 dspeed 12 - dnote 4, snare3 - dnote 4, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 2, snare3 - dnote 4, snare3 - dnote 4, snare3 + snare3 4 + snare3 4 + snare3 2 + snare3 2 + snare3 2 + snare3 2 + snare3 4 + snare3 4 loopchannel 0, Music_YellowUnusedSong_branch_830c3 -; 0x8316d
\ No newline at end of file +; 0x8316d diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm index 35808c35..1844b2ab 100644 --- a/audio/sfx/sfx_02_3a.asm +++ b/audio/sfx/sfx_02_3a.asm @@ -1,18 +1,18 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 vibrato 6, 2, 6 duty 2 - togglecall + toggleperfectpitch notetype 4, 11, 1 octave 3 - note G#, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + G# 2 notetype 12, 11, 3 octave 4 - note E_, 4 + E_ 4 endchannel @@ -22,11 +22,11 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e) duty 2 notetype 4, 12, 1 octave 4 - note E_, 2 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 + E_ 2 notetype 12, 12, 3 - note B_, 4 + B_ 4 endchannel @@ -34,15 +34,15 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e) executemusic notetype 4, 1, 0 octave 4 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 12, 1, 0 octave 4 - note B_, 2 + B_ 2 rest 2 endchannel ; 0xadae
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm index 538f2462..9c59d670 100644 --- a/audio/sfx/sfx_02_3b.asm +++ b/audio/sfx/sfx_02_3b.asm @@ -1,27 +1,27 @@ SFX_02_3b_Ch1: ; b316 (2:7316) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 5, 11, 4 octave 4 - note D_, 4 - note C_, 4 + D_ 4 + C_ 4 octave 3 - note A_, 8 + A_ 8 notetype 5, 11, 2 octave 4 - note D#, 2 - note D#, 2 - note D_, 2 - note C_, 2 - note C_, 2 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 octave 3 - note A#, 2 + A# 2 notetype 5, 11, 4 octave 4 - note C_, 8 + C_ 8 endchannel @@ -31,18 +31,18 @@ SFX_02_3b_Ch2: ; b335 (2:7335) duty 2 notetype 5, 12, 5 octave 4 - note A_, 4 - note F_, 4 - note C_, 8 + A_ 4 + F_ 4 + C_ 8 notetype 5, 12, 2 - note A#, 2 - note A#, 2 - note A#, 2 - note G_, 2 - note G_, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 notetype 5, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -50,21 +50,21 @@ SFX_02_3b_Ch3: ; b34d (2:734d) executemusic notetype 5, 1, 0 octave 5 - note F_, 4 - note D#, 4 - note C_, 8 - note D#, 1 + F_ 4 + D# 4 + C_ 8 + D# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0xb362
\ No newline at end of file diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm index 4ba0eb14..de5be1c7 100644 --- a/audio/sfx/sfx_02_41.asm +++ b/audio/sfx/sfx_02_41.asm @@ -1,23 +1,23 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 notetype 5, 11, 1 octave 3 - note A_, 2 - note A_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note A_, 2 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 octave 4 - note C_, 4 - note E_, 4 + C_ 4 + E_ 4 octave 3 - note F_, 4 + F_ 4 endchannel @@ -26,21 +26,21 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1) duty 2 notetype 5, 12, 2 octave 5 - note F_, 2 - note E_, 1 + F_ 2 + E_ 1 rest 1 - note D_, 2 - note C_, 1 + D_ 2 + C_ 1 rest 1 octave 4 - note A#, 2 + A# 2 octave 5 - note C_, 2 - note D_, 2 - note E_, 2 - note F_, 4 - note G_, 4 - note F_, 4 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 endchannel @@ -48,31 +48,31 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7) executemusic notetype 5, 1, 0 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note A#, 1 + A# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 3 - note C_, 1 + C_ 1 rest 3 octave 4 - note F_, 2 + F_ 2 rest 2 endchannel ; 0xb316
\ No newline at end of file diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm index e9112a02..5dfcb574 100644 --- a/audio/sfx/sfx_02_42.asm +++ b/audio/sfx/sfx_02_42.asm @@ -1,25 +1,25 @@ SFX_02_42_Ch1: ; b362 (2:7362) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 5, 10, 4 octave 3 - note A#, 4 + A# 4 notetype 5, 11, 1 octave 4 - note C_, 2 - note C_, 1 - note C_, 1 + C_ 2 + C_ 1 + C_ 1 notetype 5, 10, 4 - note D#, 4 + D# 4 notetype 5, 11, 1 - note F_, 2 - note F_, 1 - note F_, 1 + F_ 2 + F_ 1 + F_ 1 notetype 5, 11, 4 - note A#, 8 + A# 8 endchannel @@ -29,21 +29,21 @@ SFX_02_42_Ch2: ; b381 (2:7381) duty 2 notetype 5, 13, 1 octave 4 - note G_, 2 - note G_, 1 - note G_, 1 + G_ 2 + G_ 1 + G_ 1 notetype 5, 12, 4 - note D#, 4 + D# 4 notetype 5, 13, 1 - note G#, 2 - note G#, 1 - note G#, 1 - note A#, 2 - note A#, 1 - note A#, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 notetype 5, 12, 4 octave 5 - note D#, 8 + D# 8 endchannel @@ -51,10 +51,10 @@ SFX_02_42_Ch3: ; b39d (2:739d) executemusic notetype 5, 1, 0 octave 4 - note D#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - note D#, 8 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 endchannel ; 0xb3a7
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm index ad47ebf0..ade4d200 100644 --- a/audio/sfx/sfx_02_5e.asm +++ b/audio/sfx/sfx_02_5e.asm @@ -2,21 +2,21 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca) vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 - note E_, 2 - note F_, 2 - note G_, 4 - note A_, 2 - note G_, 2 + E_ 2 + F_ 2 + G_ 4 + A_ 2 + G_ 2 octave 6 - note C_, 4 - note C_, 2 - note D_, 2 - note C_, 2 + C_ 4 + C_ 2 + D_ 2 + C_ 2 octave 5 - note G_, 2 - note A_, 2 - note F_, 2 - note G_, 8 + G_ 2 + A_ 2 + F_ 2 + G_ 8 rest 12 endchannel ; 0x83e1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm index b7791942..24cb206c 100644 --- a/audio/sfx/sfx_08_3a.asm +++ b/audio/sfx/sfx_08_3a.asm @@ -1,22 +1,22 @@ SFX_08_3a_Ch1: ; 2397d (8:797d) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 6, 11, 4 octave 4 - note F_, 4 + F_ 4 notetype 4, 11, 2 - note C_, 2 - note F_, 2 - note C_, 2 + C_ 2 + F_ 2 + C_ 2 notetype 6, 11, 3 - note D#, 2 - note D#, 2 - note E_, 2 + D# 2 + D# 2 + E_ 2 notetype 6, 11, 4 - note F_, 8 + F_ 8 endchannel @@ -26,17 +26,17 @@ SFX_08_3a_Ch2: ; 23998 (8:7998) duty 2 notetype 6, 12, 4 octave 4 - note A_, 4 + A_ 4 notetype 4, 12, 2 - note A_, 2 - note A_, 2 - note A_, 2 + A_ 2 + A_ 2 + A_ 2 notetype 6, 12, 4 - note A#, 2 - note A#, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 notetype 6, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -44,21 +44,21 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0) executemusic notetype 6, 1, 0 octave 5 - note A_, 4 + A_ 4 notetype 4, 1, 0 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 notetype 6, 1, 0 - note G_, 1 + G_ 1 rest 1 - note D#, 1 + D# 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0x239c7
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm index cd123b01..910cf9dc 100644 --- a/audio/sfx/sfx_08_3b.asm +++ b/audio/sfx/sfx_08_3b.asm @@ -1,27 +1,27 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 5, 11, 4 octave 4 - note D_, 4 - note C_, 4 + D_ 4 + C_ 4 octave 3 - note A_, 8 + A_ 8 notetype 5, 11, 2 octave 4 - note D#, 2 - note D#, 2 - note D_, 2 - note C_, 2 - note C_, 2 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 octave 3 - note A#, 2 + A# 2 notetype 5, 11, 4 octave 4 - note C_, 8 + C_ 8 endchannel @@ -31,18 +31,18 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6) duty 2 notetype 5, 12, 5 octave 4 - note A_, 4 - note F_, 4 - note C_, 8 + A_ 4 + F_ 4 + C_ 8 notetype 5, 12, 2 - note A#, 2 - note A#, 2 - note A#, 2 - note G_, 2 - note G_, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 notetype 5, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -50,21 +50,21 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe) executemusic notetype 5, 1, 0 octave 5 - note F_, 4 - note D#, 4 - note C_, 8 - note D#, 1 + F_ 4 + D# 4 + C_ 8 + D# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0x23a13
\ No newline at end of file diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm index 5f2b9d33..b1d35eb1 100644 --- a/audio/sfx/sfx_08_46.asm +++ b/audio/sfx/sfx_08_46.asm @@ -1,24 +1,24 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 3 - togglecall + toggleperfectpitch notetype 6, 11, 2 octave 3 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 1 - note G#, 1 - note B_, 2 + E_ 2 + F# 2 + G# 2 + G# 1 + G# 1 + B_ 2 octave 4 - note C#, 2 - note D#, 2 - note D#, 1 - note D#, 1 + C# 2 + D# 2 + D# 1 + D# 1 notetype 6, 11, 5 - note E_, 8 + E_ 8 endchannel @@ -27,20 +27,20 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e) duty 2 notetype 6, 12, 2 octave 4 - note G#, 2 - note G#, 1 - note G#, 1 - note E_, 2 - note E_, 1 - note E_, 1 - note B_, 2 - note B_, 1 - note B_, 1 - note A_, 2 - note A_, 1 - note A_, 1 + G# 2 + G# 1 + G# 1 + E_ 2 + E_ 1 + E_ 1 + B_ 2 + B_ 1 + B_ 1 + A_ 2 + A_ 1 + A_ 1 notetype 6, 12, 5 - note G#, 8 + G# 8 endchannel @@ -48,15 +48,15 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44) executemusic notetype 6, 1, 0 octave 4 - note B_, 2 + B_ 2 rest 2 octave 5 - note C#, 2 + C# 2 rest 2 - note D#, 2 + D# 2 rest 2 - note F#, 2 - note G_, 2 - note G#, 4 + F# 2 + G_ 2 + G# 4 endchannel ; 0x23a53
\ No newline at end of file diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm index 39990ae3..0a25cb45 100644 --- a/audio/sfx/sfx_08_75.asm +++ b/audio/sfx/sfx_08_75.asm @@ -4,12 +4,12 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0) duty 2 notetype 10, 8, 7 octave 5 - note G#, 8 + G# 8 octave 6 - note F#, 4 - note E_, 4 + F# 4 + E_ 4 octave 5 - note G#, 8 + G# 8 endchannel @@ -19,12 +19,12 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0) duty 2 notetype 11, 6, 7 octave 5 - note G#, 8 + G# 8 notetype 10, 6, 7 octave 6 - note F#, 4 - note E_, 4 + F# 4 + E_ 4 octave 5 - note G#, 8 + G# 8 endchannel ; 0x20902
\ No newline at end of file diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/sfx_08_pokeflute.asm index 3160f87c..103e2d56 100755 --- a/audio/sfx/sfx_08_pokeflute.asm +++ b/audio/sfx/sfx_08_pokeflute.asm @@ -1,5 +1,5 @@ SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) - tempo 1, 0 + tempo 256 SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm index 28f1dfd7..cf3f32a7 100755 --- a/audio/sfx/sfx_08_pokeflute_ch3.asm +++ b/audio/sfx/sfx_08_pokeflute_ch3.asm @@ -3,12 +3,12 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) vibrato 16, 1, 4 notetype 8, 1, 0 octave 5 - note E_, 3 - note F_, 3 - note G_, 7 - note A_, 3 - note G_, 3 + E_ 3 + F_ 3 + G_ 7 + A_ 3 + G_ 3 octave 6 - note C_, 13 + C_ 13 endchannel ; 0x204aa
\ No newline at end of file diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm index be887476..0bfe4dd3 100755 --- a/audio/sfx/sfx_08_unused2.asm +++ b/audio/sfx/sfx_08_unused2.asm @@ -1,19 +1,19 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 vibrato 6, 2, 6 duty 2 - togglecall + toggleperfectpitch notetype 6, 11, 1 octave 3 - note G#, 2 - note G#, 2 + G# 2 + G# 2 notetype 6, 11, 3 - note G#, 2 - note B_, 2 + G# 2 + B_ 2 octave 4 - note E_, 8 + E_ 8 endchannel @@ -23,13 +23,13 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347) duty 2 notetype 6, 12, 1 octave 4 - note E_, 2 - note E_, 1 - note E_, 1 + E_ 2 + E_ 1 + E_ 1 notetype 6, 12, 3 - note E_, 2 - note G#, 2 - note B_, 8 + E_ 2 + G# 2 + B_ 8 endchannel @@ -37,21 +37,21 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359) executemusic notetype 6, 1, 0 octave 4 - note B_, 1 + B_ 1 rest 1 notetype 3, 1, 0 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 6, 1, 0 - note B_, 1 + B_ 1 rest 1 octave 5 - note E_, 1 + E_ 1 rest 1 octave 4 - note B_, 4 + B_ 4 rest 4 endchannel ; 0x22370
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm index 2f7f3045..1d92127e 100644 --- a/audio/sfx/sfx_1f_3a.asm +++ b/audio/sfx/sfx_1f_3a.asm @@ -1,18 +1,18 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 vibrato 6, 2, 6 duty 2 - togglecall + toggleperfectpitch notetype 4, 11, 1 octave 3 - note G#, 2 - note G#, 2 - note G#, 2 + G# 2 + G# 2 + G# 2 notetype 12, 11, 3 octave 4 - note E_, 4 + E_ 4 endchannel @@ -22,11 +22,11 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867) duty 2 notetype 4, 12, 1 octave 4 - note E_, 2 - note E_, 2 - note E_, 2 + E_ 2 + E_ 2 + E_ 2 notetype 12, 12, 3 - note B_, 4 + B_ 4 endchannel @@ -34,15 +34,15 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877) executemusic notetype 4, 1, 0 octave 4 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 - note B_, 1 + B_ 1 rest 1 notetype 12, 1, 0 octave 4 - note B_, 2 + B_ 2 rest 2 endchannel ; 0x7e887
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm index a167d4cf..3ce00c8a 100644 --- a/audio/sfx/sfx_1f_3b.asm +++ b/audio/sfx/sfx_1f_3b.asm @@ -1,27 +1,27 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 5, 11, 4 octave 4 - note D_, 4 - note C_, 4 + D_ 4 + C_ 4 octave 3 - note A_, 8 + A_ 8 notetype 5, 11, 2 octave 4 - note D#, 2 - note D#, 2 - note D_, 2 - note C_, 2 - note C_, 2 + D# 2 + D# 2 + D_ 2 + C_ 2 + C_ 2 octave 3 - note A#, 2 + A# 2 notetype 5, 11, 4 octave 4 - note C_, 8 + C_ 8 endchannel @@ -31,18 +31,18 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) duty 2 notetype 5, 12, 5 octave 4 - note A_, 4 - note F_, 4 - note C_, 8 + A_ 4 + F_ 4 + C_ 8 notetype 5, 12, 2 - note A#, 2 - note A#, 2 - note A#, 2 - note G_, 2 - note G_, 2 - note A#, 2 + A# 2 + A# 2 + A# 2 + G_ 2 + G_ 2 + A# 2 notetype 5, 12, 4 - note A_, 8 + A_ 8 endchannel @@ -50,21 +50,21 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) executemusic notetype 5, 1, 0 octave 5 - note F_, 4 - note D#, 4 - note C_, 8 - note D#, 1 + F_ 4 + D# 4 + C_ 8 + D# 1 rest 1 - note D#, 1 + D# 1 rest 1 - note E_, 1 + E_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note A_, 8 + A_ 8 endchannel ; 0x7ee74
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm index 62153990..6f854c74 100644 --- a/audio/sfx/sfx_1f_41.asm +++ b/audio/sfx/sfx_1f_41.asm @@ -1,23 +1,23 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 notetype 5, 11, 1 octave 3 - note A_, 2 - note A_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note A_, 2 + A_ 2 + A_ 2 + G_ 2 + G_ 2 + F_ 2 + E_ 2 + F_ 2 + A_ 2 octave 4 - note C_, 4 - note E_, 4 + C_ 4 + E_ 4 octave 3 - note F_, 4 + F_ 4 endchannel @@ -26,21 +26,21 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) duty 2 notetype 5, 12, 2 octave 5 - note F_, 2 - note E_, 1 + F_ 2 + E_ 1 rest 1 - note D_, 2 - note C_, 1 + D_ 2 + C_ 1 rest 1 octave 4 - note A#, 2 + A# 2 octave 5 - note C_, 2 - note D_, 2 - note E_, 2 - note F_, 4 - note G_, 4 - note F_, 4 + C_ 2 + D_ 2 + E_ 2 + F_ 4 + G_ 4 + F_ 4 endchannel @@ -48,31 +48,31 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) executemusic notetype 5, 1, 0 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note F_, 2 + F_ 2 octave 5 - note C_, 1 + C_ 1 rest 1 octave 4 - note A#, 1 + A# 1 rest 1 - note A_, 1 + A_ 1 rest 1 - note G_, 1 + G_ 1 rest 1 - note F_, 1 + F_ 1 rest 1 - note E_, 1 + E_ 1 rest 1 octave 5 - note F_, 1 + F_ 1 rest 3 - note C_, 1 + C_ 1 rest 3 octave 4 - note F_, 2 + F_ 2 rest 2 endchannel ; 0x7ee28
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm index c0805196..6c8c388a 100644 --- a/audio/sfx/sfx_1f_42.asm +++ b/audio/sfx/sfx_1f_42.asm @@ -1,25 +1,25 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) executemusic - tempo 1, 0 - stereopanning 119 + tempo 256 + volume 7, 7 duty 2 - togglecall + toggleperfectpitch notetype 5, 10, 4 octave 3 - note A#, 4 + A# 4 notetype 5, 11, 1 octave 4 - note C_, 2 - note C_, 1 - note C_, 1 + C_ 2 + C_ 1 + C_ 1 notetype 5, 10, 4 - note D#, 4 + D# 4 notetype 5, 11, 1 - note F_, 2 - note F_, 1 - note F_, 1 + F_ 2 + F_ 1 + F_ 1 notetype 5, 11, 4 - note A#, 8 + A# 8 endchannel @@ -29,21 +29,21 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) duty 2 notetype 5, 13, 1 octave 4 - note G_, 2 - note G_, 1 - note G_, 1 + G_ 2 + G_ 1 + G_ 1 notetype 5, 12, 4 - note D#, 4 + D# 4 notetype 5, 13, 1 - note G#, 2 - note G#, 1 - note G#, 1 - note A#, 2 - note A#, 1 - note A#, 1 + G# 2 + G# 1 + G# 1 + A# 2 + A# 1 + A# 1 notetype 5, 12, 4 octave 5 - note D#, 8 + D# 8 endchannel @@ -51,10 +51,10 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) executemusic notetype 5, 1, 0 octave 4 - note D#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - note D#, 8 + D# 4 + G# 4 + G_ 4 + F_ 4 + D# 8 endchannel ; 0x7eeb9
\ No newline at end of file diff --git a/audio/duty_1.asm b/audio/wave_instruments.asm index 2c650ac1..fede06af 100644 --- a/audio/duty_1.asm +++ b/audio/wave_instruments.asm @@ -1,33 +1,32 @@ -Music2_Channel3DutyPointers: ; 0x8361 - dw Music2_Channel3Duty0 - dw Music2_Channel3Duty1 - dw Music2_Channel3Duty2 - dw Music2_Channel3Duty3 - dw Music2_Channel3Duty4 - dw Music2_Channel3Duty5 ; used in the Lavender Town theme - dw Music2_Channel3Duty5 ; unused - dw Music2_Channel3Duty5 ; unused - dw Music2_Channel3Duty5 ; unused + dw .wave0 + dw .wave1 + dw .wave2 + dw .wave3 + dw .wave4 + dw .wave5 ; used in the Lavender Town and Pokemon Tower themes + dw .wave5 ; unused + dw .wave5 ; unused + dw .wave5 ; unused ; these are the definitions for the channel 3 instruments ; each instrument definition is made up of 32 points (nibbles) that form ; the graph of the wave ; the current instrument is copied to $FF30 -Music2_Channel3Duty0: ; 0x8373 +.wave0 db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 -Music2_Channel3Duty1: ; 0x8383 +.wave1 db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 -Music2_Channel3Duty2: ; 0x8393 +.wave2 db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 -Music2_Channel3Duty3: ; 0x83a3 +.wave3 db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 -Music2_Channel3Duty4: ; 0x83b3 +.wave4 db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 ; duty 5 reads from sfx data -Music2_Channel3Duty5: ; 0x83c3 +.wave5 |