diff options
Diffstat (limited to 'audio')
539 files changed, 24207 insertions, 24653 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index bb780975..bd021ab3 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -1,7 +1,7 @@ ; The first of three duplicated sound engines. Audio1_UpdateMusic:: - ld c, CH0 + ld c, Ch1 .loop ld b, 0 ld hl, wChannelSoundIDs @@ -10,7 +10,7 @@ Audio1_UpdateMusic:: and a jr z, .nextChannel ld a, c - cp CH4 + cp Ch5 jr nc, .applyAffects ; if sfx channel ld a, [wMuteAudioAndPauseMusic] and a @@ -30,7 +30,7 @@ Audio1_UpdateMusic:: .nextChannel ld a, c inc c ; inc channel number - cp CH7 + cp Ch8 jr nz, .loop ret @@ -46,9 +46,9 @@ Audio1_ApplyMusicAffects: dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp CH4 + cp Ch5 jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -57,25 +57,25 @@ Audio1_ApplyMusicAffects: .startChecks ld hl, wChannelFlags1 add hl, bc - bit BIT_ROTATE_DUTY, [hl] + bit BIT_ROTATE_DUTY_CYCLE, [hl] jr z, .checkForExecuteMusic - call Audio1_ApplyDutyCycle + call Audio1_ApplyDutyCyclePattern .checkForExecuteMusic ld b, 0 ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] - jr nz, .checkForPitchBend + jr nz, .checkForPitchSlide ld hl, wChannelFlags1 add hl, bc bit BIT_NOISE_OR_SFX, [hl] - jr nz, .skipPitchBendVibrato -.checkForPitchBend + jr nz, .skipPitchSlideVibrato +.checkForPitchSlide ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_ON, [hl] + bit BIT_PITCH_SLIDE_ON, [hl] jr z, .checkVibratoDelay - jp Audio1_ApplyPitchBend + jp Audio1_ApplyPitchSlide .checkVibratoDelay ld hl, wChannelVibratoDelayCounters add hl, bc @@ -83,7 +83,7 @@ Audio1_ApplyMusicAffects: and a ; check if delay is over jr z, .checkForVibrato dec [hl] ; otherwise, dec delay -.skipPitchBendVibrato +.skipPitchSlideVibrato ret .checkForVibrato ld hl, wChannelVibratoExtents @@ -142,7 +142,7 @@ Audio1_ApplyMusicAffects: ret ; this routine executes all music commands that take up no time, -; like tempo changes, duty changes etc. and doesn't return +; like tempo changes, duty cycle changes etc. and doesn't return ; until the first note is reached Audio1_PlayNextNote: ; reload the vibrato delay counter @@ -155,8 +155,8 @@ Audio1_PlayNextNote: ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_ON, [hl] - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ld a, c cp $4 jr nz, .asm_918c @@ -166,21 +166,21 @@ Audio1_PlayNextNote: call Audio1_EnableChannelOutput ret .asm_918c - call Audio1_endchannel + call Audio1_sound_ret ret -Audio1_endchannel: +Audio1_sound_ret: call Audio1_GetNextMusicByte ld d, a - cp $ff ; is this command an endchannel? - jp nz, Audio1_callchannel ; no + cp $ff ; is this command a sound_ret? + jp nz, Audio1_sound_call ; no ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit BIT_CHANNEL_CALL, [hl] + bit BIT_SOUND_CALL, [hl] jr nz, .returnFromCall ld a, c - cp CH3 + cp Ch4 jr nc, .noiseOrSfxChannel jr .disableChannelOutput .noiseOrSfxChannel @@ -188,7 +188,7 @@ Audio1_endchannel: ld hl, wChannelFlags2 add hl, bc res BIT_EXECUTE_MUSIC, [hl] - cp CH6 + cp Ch7 jr nz, .skipSfxChannel3 ; restart hardware channel 3 (wave channel) output ld a, $0 @@ -196,15 +196,15 @@ Audio1_endchannel: ld a, $80 ld [rNR30], a .skipSfxChannel3 - jr nz, .asm_9222 + jr nz, .dontDisable ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr z, .asm_9222 + jr z, .dontDisable xor a ld [wDisableChannelOutputWhenSfxEnds], a jr .disableChannelOutput -.asm_9222 - jr .asm_9248 +.dontDisable + jr .afterDisable .returnFromCall res 1, [hl] ld d, $0 @@ -224,31 +224,31 @@ Audio1_endchannel: inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Audio1_endchannel + jp Audio1_sound_ret .disableChannelOutput ld hl, Audio1_HWChannelDisableMasks add hl, bc ld a, [rNR51] and [hl] ld [rNR51], a -.asm_9248 - ld a, [wChannelSoundIDs + CH4] +.afterDisable + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START - jr nc, .asm_9251 + jr nc, .maybeCry jr .skipCry -.asm_9251 - ld a, [wChannelSoundIDs + CH4] +.maybeCry + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_END jr z, .skipCry jr c, .cry jr .skipCry .cry ld a, c - cp CH4 - jr z, .asm_9265 + cp Ch5 + jr z, .skipRewind call Audio1_GoBackOneCommandIfCry ret c -.asm_9265 +.skipRewind ld a, [wSavedVolume] ld [rNR50], a xor a @@ -259,9 +259,9 @@ Audio1_endchannel: ld [hl], b ret -Audio1_callchannel: - cp $fd ; is this command a callchannel? - jp nz, Audio1_loopchannel ; no +Audio1_sound_call: + cp $fd ; is this command a sound_call? + jp nz, Audio1_sound_loop ; no call Audio1_GetNextMusicByte push af call Audio1_GetNextMusicByte @@ -293,12 +293,12 @@ Audio1_callchannel: ld b, $0 ld hl, wChannelFlags1 add hl, bc - set BIT_CHANNEL_CALL, [hl] ; set the call flag - jp Audio1_endchannel + set BIT_SOUND_CALL, [hl] ; set the call flag + jp Audio1_sound_ret -Audio1_loopchannel: - cp $fe ; is this command a loopchannel? - jp nz, Audio1_notetype ; no +Audio1_sound_loop: + cp $fe ; is this command a sound_loop? + jp nz, Audio1_note_type ; no call Audio1_GetNextMusicByte ld e, a and a @@ -313,7 +313,7 @@ Audio1_loopchannel: ld [hl], a call Audio1_GetNextMusicByte ; skip pointer call Audio1_GetNextMusicByte - jp Audio1_endchannel + jp Audio1_sound_ret .loopAgain ; inc loop count inc a ld [hl], a @@ -332,12 +332,12 @@ Audio1_loopchannel: pop af ld [hli], a ld [hl], b - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_notetype: +Audio1_note_type: and $f0 - cp $d0 ; is this command a notetype? - jp nz, Audio1_toggleperfectpitch ; no + cp $d0 ; is this command a note_type? + jp nz, Audio1_toggle_perfect_pitch ; no ld a, d and $f ld b, $0 @@ -345,14 +345,14 @@ Audio1_notetype: add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp CH3 + cp Ch4 jr z, .noiseChannel ; noise channel has 0 params call Audio1_GetNextMusicByte ld d, a ld a, c - cp CH2 + cp Ch3 jr z, .musicChannel3 - cp CH6 + cp Ch7 jr nz, .skipChannel3 ld hl, wSfxWaveInstrument jr .channel3 @@ -376,11 +376,11 @@ Audio1_notetype: add hl, bc ld [hl], d .noiseChannel - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_toggleperfectpitch: +Audio1_toggle_perfect_pitch: ld a, d - cp $e8 ; is this command a toggleperfectpitch? + cp $e8 ; is this command a toggle_perfect_pitch? jr nz, Audio1_vibrato ; no ld b, 0 ld hl, wChannelFlags1 @@ -388,11 +388,11 @@ Audio1_toggleperfectpitch: ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_vibrato: cp $ea ; is this command a vibrato? - jr nz, Audio1_pitchbend ; no + jr nz, Audio1_pitch_slide ; no call Audio1_GetNextMusicByte ld b, 0 ld hl, wChannelVibratoDelayCounters @@ -436,14 +436,14 @@ Audio1_vibrato: or d ld [hl], a - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_pitchbend: - cp $eb ; is this command a pitchbend? - jr nz, Audio1_duty ; no +Audio1_pitch_slide: + cp $eb ; is this command a pitch_slide? + jr nz, Audio1_duty_cycle ; no call Audio1_GetNextMusicByte ld b, 0 - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc ld [hl], a call Audio1_GetNextMusicByte @@ -455,38 +455,38 @@ Audio1_pitchbend: and $f call Audio1_CalculateFrequency ld b, 0 - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld [hl], e ld b, 0 ld hl, wChannelFlags1 add hl, bc - set BIT_PITCH_BEND_ON, [hl] + set BIT_PITCH_SLIDE_ON, [hl] call Audio1_GetNextMusicByte ld d, a - jp Audio1_notelength + jp Audio1_note_length -Audio1_duty: - cp $ec ; is this command a duty? +Audio1_duty_cycle: + cp $ec ; is this command a duty_cycle? jr nz, Audio1_tempo ; no call Audio1_GetNextMusicByte rrca rrca and $c0 ld b, 0 - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store duty - jp Audio1_endchannel + ld [hl], a ; store duty cycle + jp Audio1_sound_ret Audio1_tempo: cp $ed ; is this command a tempo? - jr nz, Audio1_stereopanning ; no + jr nz, Audio1_stereo_panning ; no ld a, c - cp CH4 + cp Ch5 jr nc, .sfxChannel call Audio1_GetNextMusicByte ld [wMusicTempo], a ; store first param @@ -509,19 +509,19 @@ Audio1_tempo: ld [wChannelNoteDelayCountersFractionalPart + 6], a ld [wChannelNoteDelayCountersFractionalPart + 7], a .musicChannelDone - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_stereopanning: - cp $ee ; is this command a stereopanning? +Audio1_stereo_panning: + cp $ee ; is this command a stereo_panning? jr nz, Audio1_unknownmusic0xef ; no call Audio1_GetNextMusicByte ld [wStereoPanning], a ; store panning - jp Audio1_endchannel + jp Audio1_sound_ret ; this appears to never be used Audio1_unknownmusic0xef: cp $ef ; is this command an unknownmusic0xef? - jr nz, Audio1_dutycycle ; no + jr nz, Audio1_duty_cycle_pattern ; no call Audio1_GetNextMusicByte push bc ld b, a @@ -530,76 +530,77 @@ Audio1_unknownmusic0xef: ld a, [wDisableChannelOutputWhenSfxEnds] and a jr nz, .skip - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch8] ld [wDisableChannelOutputWhenSfxEnds], a xor a - ld [wChannelSoundIDs + CH7], a + ld [wChannelSoundIDs + Ch8], a .skip - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_dutycycle: - cp $fc ; is this command a dutycycle? +Audio1_duty_cycle_pattern: + cp $fc ; is this command a duty_cycle_pattern? jr nz, Audio1_volume ; no call Audio1_GetNextMusicByte ld b, 0 - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, bc - ld [hl], a ; store full cycle - and $c0 - ld hl, wChannelDuties + ld [hl], a ; store full pattern + and %11000000 + ld hl, wChannelDutyCycles add hl, bc - ld [hl], a ; store first duty + ld [hl], a ; store first duty cycle ld hl, wChannelFlags1 add hl, bc - set BIT_ROTATE_DUTY, [hl] - jp Audio1_endchannel + set BIT_ROTATE_DUTY_CYCLE, [hl] + jp Audio1_sound_ret Audio1_volume: cp $f0 ; is this command a volume? - jr nz, Audio1_executemusic ; no + jr nz, Audio1_execute_music ; no call Audio1_GetNextMusicByte ld [rNR50], a ; store volume - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_executemusic: - cp $f8 ; is this command an executemusic? +Audio1_execute_music: + cp $f8 ; is this command an execute_music? jr nz, Audio1_octave ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc set BIT_EXECUTE_MUSIC, [hl] - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio1_unknownsfx0x20 ; no + jr nz, Audio1_sfx_note ; no ld hl, wChannelOctaves ld b, 0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Audio1_endchannel + jp Audio1_sound_ret -Audio1_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio1_unknownsfx0x10 +; sfx_note is either square_note or noise_note depending on the channel +Audio1_sfx_note: + cp $20 ; is this command a sfx_note? + jr nz, Audio1_pitch_sweep ld a, c - cp CH3 ; is this a noise or sfx channel? - jr c, Audio1_unknownsfx0x10 ; no + cp Ch4 ; is this a noise or sfx channel? + jr c, Audio1_pitch_sweep ; no ld b, 0 ld hl, wChannelFlags2 add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? - jr nz, Audio1_unknownsfx0x10 ; yes - call Audio1_notelength + bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? + jr nz, Audio1_pitch_sweep ; yes + call Audio1_note_length -; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength +; This code seems to do the same thing as what Audio1_ApplyDutyCycleAndSoundLength ; does below. ld d, a ld b, 0 - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d @@ -616,7 +617,7 @@ Audio1_unknownsfx0x20: call Audio1_GetNextMusicByte ld e, a ld a, c - cp CH7 + cp Ch8 ld a, 0 jr z, .skip ; Channels 1 through 3 have 2 registers that control frequency, but the noise @@ -628,18 +629,18 @@ Audio1_unknownsfx0x20: .skip ld d, a push de - call Audio1_ApplyDutyAndSoundLength + call Audio1_ApplyDutyCycleAndSoundLength call Audio1_EnableChannelOutput pop de call Audio1_ApplyWavePatternAndFrequency ret -Audio1_unknownsfx0x10: +Audio1_pitch_sweep: ld a, c - cp CH4 + cp Ch5 jr c, Audio1_note ; if not a sfx ld a, d - cp $10 ; is this command a unknownsfx0x10? + cp $10 ; is this command a pitch_sweep? jr nz, Audio1_note ; no ld b, $0 ld hl, wChannelFlags2 @@ -648,17 +649,27 @@ Audio1_unknownsfx0x10: jr nz, Audio1_note ; no call Audio1_GetNextMusicByte ld [rNR10], a - jp Audio1_endchannel + jp Audio1_sound_ret Audio1_note: ld a, c - cp CH3 - jr nz, Audio1_notelength ; if not noise channel + cp Ch4 + jr nz, Audio1_note_length ; if not noise channel ld a, d and $f0 - cp $b0 ; is this command a dnote? - jr z, Audio1_dnote - jr nc, Audio1_notelength ; no + cp $b0 ; is this command a drum_note? + jr z, .drum_note + jr nc, Audio1_note_length ; no + + ; this executes when on the noise channel and + ; the command id is less than $b0 + ; in this case, the upper nybble is used as the noise instrument ($1-$a) + ; and the lower nybble is the length minus 1 (0-15) + ; however, this doesn't work for instrument #2 because the command id + ; is captured by the noise_note command (command id $2x) + ; this essentially acts like a drum_note command that is only 1 byte + ; instead of 2 and can only be used with instruments 1 and 3 through 10 + ; this is unused by the game swap a ld b, a ld a, d @@ -667,26 +678,26 @@ Audio1_note: ld a, b push de push bc - jr asm_94fd + jr .playDnote -Audio1_dnote: +.drum_note ld a, d and $f push af push bc - call Audio1_GetNextMusicByte ; get dnote instrument -asm_94fd + call Audio1_GetNextMusicByte ; get drum_note instrument +.playDnote ld d, a ld a, [wDisableChannelOutputWhenSfxEnds] and a - jr nz, .asm_9508 + jr nz, .skipDnote ld b, d call DetermineAudioFunction -.asm_9508 +.skipDnote pop bc pop de -Audio1_notelength: +Audio1_note_length: ld a, d push af and $f @@ -700,7 +711,7 @@ Audio1_notelength: ld l, b call Audio1_MultiplyAdd ld a, c - cp CH4 + cp Ch5 jr nc, .sfxChannel ld a, [wMusicTempo] ld d, a @@ -710,7 +721,7 @@ Audio1_notelength: .sfxChannel ld d, $1 ld e, $0 - cp CH7 + cp Ch8 jr z, .skip ; if noise channel call Audio1_SetSfxTempo ld a, [wSfxTempo] @@ -736,24 +747,24 @@ Audio1_notelength: ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio1_notepitch + jr nz, Audio1_note_pitch ld hl, wChannelFlags1 add hl, bc bit BIT_NOISE_OR_SFX, [hl] - jr z, Audio1_notepitch + jr z, Audio1_note_pitch pop hl ret -Audio1_notepitch: +Audio1_note_pitch: pop af and $f0 cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp CH4 + cp Ch5 jr nc, .next ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -761,9 +772,9 @@ Audio1_notepitch: ; fall through .next ld a, c - cp CH2 + cp Ch3 jr z, .channel3 - cp CH6 + cp Ch7 jr nz, .notChannel3 .channel3 ld b, 0 @@ -793,16 +804,16 @@ Audio1_notepitch: ld b, 0 ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_ON, [hl] - jr z, .skipPitchBend - call Audio1_InitPitchBendVars -.skipPitchBend + bit BIT_PITCH_SLIDE_ON, [hl] + jr z, .skipPitchSlide + call Audio1_InitPitchSlideVars +.skipPitchSlide push de ld a, c - cp CH4 + cp Ch5 jr nc, .sfxChannel ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch5 ld d, 0 ld e, a add hl, de @@ -821,13 +832,13 @@ Audio1_notepitch: ld b, REG_VOLUME_ENVELOPE call Audio1_GetRegisterPointer ld [hl], d - call Audio1_ApplyDutyAndSoundLength + call Audio1_ApplyDutyCycleAndSoundLength call Audio1_EnableChannelOutput pop de ld b, $0 ld hl, wChannelFlags1 add hl, bc - bit BIT_PERFECT_PITCH, [hl] ; has toggleperfectpitch been used? + bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? jr z, .skipFrequencyInc inc e ; if yes, increment the frequency by 1 jr nc, .skipFrequencyInc @@ -847,12 +858,12 @@ Audio1_EnableChannelOutput: or [hl] ; set this channel's bits ld d, a ld a, c - cp CH7 + cp Ch8 jr z, .noiseChannelOrNoSfx - cp CH4 + cp Ch5 jr nc, .skip ; if sfx channel ; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch5 add hl, bc ld a, [hl] and a @@ -876,21 +887,21 @@ Audio1_EnableChannelOutput: ld [rNR51], a ret -Audio1_ApplyDutyAndSoundLength: +Audio1_ApplyDutyCycleAndSoundLength: ld b, 0 ld hl, wChannelNoteDelayCounters ; use the note delay as sound length add hl, bc ld d, [hl] ld a, c - cp CH2 + cp Ch3 jr z, .skipDuty ; if music channel 3 - cp CH6 + cp Ch7 jr z, .skipDuty ; if sfx channel 3 -; include duty (except on channel 3 which doesn't have it) +; include duty cycle (except on channel 3 which doesn't have it) ld a, d and $3f ld d, a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, bc ld a, [hl] or d @@ -903,15 +914,15 @@ Audio1_ApplyDutyAndSoundLength: Audio1_ApplyWavePatternAndFrequency: ld a, c - cp CH2 + cp Ch3 jr z, .channel3 - cp CH6 + cp Ch7 jr nz, .notChannel3 ; fall through .channel3 push de ld de, wMusicWaveInstrument - cp CH2 + cp Ch3 jr z, .next ld de, wSfxWaveInstrument .next @@ -1035,7 +1046,7 @@ Audio1_GoBackOneCommandIfCry: Audio1_IsCry: ; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch5] cp CRY_SFX_START jr nc, .next jr .no @@ -1055,9 +1066,9 @@ Audio1_96c3: ld a, [wAudioROMBank] cp BANK(AudioEngine2) jr nz, .asm_96dc - ld a, [wChannelSoundIDs + CH7] + ld a, [wChannelSoundIDs + Ch8] ld b, a - ld a, [wChannelSoundIDs + CH4] + ld a, [wChannelSoundIDs + Ch5] or b cp $9d jr c, .asm_96dc @@ -1071,29 +1082,29 @@ Audio1_96c3: scf ret -Audio1_ApplyPitchBend: +Audio1_ApplyPitchSlide: ld hl, wChannelFlags1 add hl, bc - bit BIT_PITCH_BEND_DECREASING, [hl] + bit BIT_PITCH_SLIDE_DECREASING, [hl] jp nz, .frequencyDecreasing ; frequency increasing - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld l, [hl] ld h, b add hl, de ld d, h ld e, l - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc push hl - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] pop hl @@ -1105,26 +1116,26 @@ Audio1_ApplyPitchBend: ld a, 0 adc d ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] cp d jp c, .reachedTargetFrequency jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] cp e jp c, .reachedTargetFrequency jr .applyUpdatedFrequency .frequencyDecreasing - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld a, [hl] - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld e, [hl] sub e @@ -1132,7 +1143,7 @@ Audio1_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld a, [hl] add a @@ -1143,22 +1154,22 @@ Audio1_ApplyPitchBend: ld a, d sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, d cp [hl] jr c, .reachedTargetFrequency jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e cp [hl] jr c, .reachedTargetFrequency .applyUpdatedFrequency - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d ld b, REG_FREQUENCY_LO @@ -1168,38 +1179,38 @@ Audio1_ApplyPitchBend: ld [hl], d ret .reachedTargetFrequency -; Turn off pitch bend when the target frequency has been reached. +; Turn off pitch slide when the target frequency has been reached. ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_ON, [hl] - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_ON, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] ret -Audio1_InitPitchBendVars: - ld hl, wChannelPitchBendCurrentFrequencyHighBytes +Audio1_InitPitchSlideVars: + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld [hl], d - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld [hl], e ld hl, wChannelNoteDelayCounters add hl, bc ld a, [hl] - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc sub [hl] jr nc, .next ld a, 1 .next ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, e sub [hl] ld e, a ld a, d sbc b - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc sub [hl] jr c, .targetFrequencyGreater @@ -1207,18 +1218,18 @@ Audio1_InitPitchBendVars: ld b, 0 ld hl, wChannelFlags1 add hl, bc - set BIT_PITCH_BEND_DECREASING, [hl] + set BIT_PITCH_SLIDE_DECREASING, [hl] jr .next2 .targetFrequencyGreater ; If the target frequency is greater, subtract the current frequency from ; the target frequency to get the absolute difference. - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, bc ld d, [hl] - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, bc ld e, [hl] - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, bc ld a, [hl] sub e @@ -1233,7 +1244,7 @@ Audio1_InitPitchBendVars: sbc b ld d, a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, bc ld a, [hl] sub d @@ -1241,10 +1252,10 @@ Audio1_InitPitchBendVars: ld b, 0 ld hl, wChannelFlags1 add hl, bc - res BIT_PITCH_BEND_DECREASING, [hl] + res BIT_PITCH_SLIDE_DECREASING, [hl] .next2 - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, bc .divideLoop inc b @@ -1263,20 +1274,20 @@ Audio1_InitPitchBendVars: add [hl] ld d, b ; d = quotient + 1 ld b, 0 - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, bc ld [hl], d ; store quotient + 1 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, bc ld [hl], a ; store remainder - dividend - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, bc ld [hl], a ; store remainder - dividend ret -Audio1_ApplyDutyCycle: +Audio1_ApplyDutyCyclePattern: ld b, 0 - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, bc ld a, [hl] rlca @@ -1358,7 +1369,7 @@ Audio1_PlaySound:: ld a, [wSoundID] cp $ff jp z, .stopAllAudio - cp MAX_SFX_ID + cp MAX_SFX_ID_1 jp z, .playSfx jp c, .playSfx cp $fe @@ -1408,28 +1419,27 @@ Audio1_PlaySound:: add hl, de ld a, [hl] and a - jr z, .asm_99a3 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_999a + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_9993 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_9993 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_99a3 - jr c, .asm_99a3 -.asm_999a + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_99a3 - jr c, .asm_99a3 + jr z, .playChannel + jr c, .playChannel ret -.asm_99a3 +.playChannel call InitSFXVariables -.asm_9a2b ld a, c and a jp z, .playSoundCommon @@ -1478,7 +1488,7 @@ Audio1_PlaySound:: push bc ld b, 0 ld c, a - cp CH3 + cp Ch4 jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc @@ -1512,25 +1522,25 @@ Audio1_PlaySound:: jr nz, .commandPointerLoop ld a, [wSoundID] cp CRY_SFX_START - jr nc, .asm_9aeb + jr nc, .maybeCry jr .done -.asm_9aeb +.maybeCry ld a, [wSoundID] cp CRY_SFX_END jr z, .done jr c, .cry jr .done .cry - ld hl, wChannelSoundIDs + CH4 + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx wave channel pointer - ld de, Audio1_CryEndchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio1_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a jr nz, .done @@ -1541,8 +1551,8 @@ Audio1_PlaySound:: .done ret -Audio1_CryEndchannel: - endchannel +Audio1_CryRet: + sound_ret Audio1_HWChannelBaseAddresses: ; the low bytes of each HW channel's base address @@ -1590,5 +1600,3 @@ Audio1_Pitches: dw $FB58 ; A_ dw $FB9B ; A# dw $FBDA ; B_ - - diff --git a/audio/engine_2.asm b/audio/engine_2.asm index d1b07df9..5fe686a8 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -1,22 +1,27 @@ +; The second of three duplicated sound engines. +; This copy has a few differences relating to battle sound effects +; and the low health alarm that plays in battle + Audio2_PlaySound:: ld [wSoundID], a ld a, [wSoundID] cp $ff - jp z, Audio2_2193c - cp $e9 - jp z, Audio2_218db - jp c, Audio2_218db + jp z, .stopAllAudio + cp MAX_SFX_ID_2 + jp z, .playSfx + jp c, .playSfx cp $fe - jr z, .asm_218d5 - jp nc, Audio2_218db -.asm_218d5 + jr z, .playMusic + jp nc, .playSfx + +.playMusic call InitMusicVariables - jp Audio2_21940 + jp .playSoundCommon -Audio2_218db: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -31,7 +36,7 @@ Audio2_218db: rlca rlca ld c, a -.asm_218f4 +.sfxChannelLoop ld d, c ld a, c add a @@ -46,48 +51,48 @@ Audio2_218db: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_21930 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_21927 + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_21920 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_21920 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_21930 - jr c, .asm_21930 -.asm_21927 + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_21930 - jr c, .asm_21930 + jr z, .playChannel + jr c, .playChannel ret -.asm_21930 +.playChannel call InitSFXVariables ld a, c and a - jp z, Audio2_21940 + jp z, .playSoundCommon dec c - jp .asm_218f4 + jp .sfxChannelLoop -Audio2_2193c: +.stopAllAudio call StopAllAudio ret -Audio2_21940: +.playSoundCommon ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -107,26 +112,26 @@ Audio2_21940: ld b, c inc b inc de - ld c, $0 -.asm_21962 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_2196a + jr z, .next inc c inc hl inc hl - jr .asm_21962 -.asm_2196a + jr .commandPointerLoop +.next push af push hl push bc - ld b, $0 + ld b, 0 ld c, a - cp $3 - jr c, .asm_2197a + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_2197a + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -138,7 +143,7 @@ Audio2_21940: pop af push hl push bc - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc @@ -152,52 +157,52 @@ Audio2_21940: and a ld a, [de] inc de - jr nz, .asm_21962 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_219a3 - jr .asm_219cd -.asm_219a3 + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_219cd - jr c, .asm_219ae - jr .asm_219cd -.asm_219ae - ld hl, wChannelSoundIDs + CH4 + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer - ld de, Noise2_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio2_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_219cd + jr nz, .done ld a, [rNR50] ld [wSavedVolume], a ld a, $77 ld [rNR50], a -.asm_219cd +.done ret -Noise2_endchannel: - endchannel +Audio2_CryRet: + sound_ret Music_PokeFluteInBattle:: ; begin playing the "caught mon" sound effect ld a, SFX_CAUGHT_MON call PlaySoundWaitForCurrent ; then immediately overwrtie the channel pointers - ld hl, wChannelCommandPointers + CH4 * 2 - ld de, SFX_08_PokeFlute_Ch1 + ld hl, wChannelCommandPointers + Ch5 * 2 + ld de, SFX_Pokeflute_Ch5 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch2 + ld de, SFX_Pokeflute_Ch6 call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch3 + ld de, SFX_Pokeflute_Ch7 Audio2_OverwriteChannelPointer: ld a, e @@ -206,7 +211,7 @@ Audio2_OverwriteChannelPointer: ld [hli], a ret -INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" +INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm" Audio2_InitMusicVariables:: xor a @@ -217,53 +222,53 @@ Audio2_InitMusicVariables:: ld [wSfxWaveInstrument], a ld d, $8 ld hl, wChannelReturnAddresses - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelCommandPointers - call FillAudioRAM2 + call Audio2_FillMem ld d, $4 ld hl, wChannelSoundIDs - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelFlags1 - call FillAudioRAM2 - ld hl, wChannelDuties - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelDutyCycles - call FillAudioRAM2 + call Audio2_FillMem + ld hl, wChannelDutyCyclePatterns + call Audio2_FillMem ld hl, wChannelVibratoDelayCounters - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelVibratoExtents - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelVibratoRates - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelFrequencyLowBytes - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelVibratoDelayCounterReloadValues - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelFlags2 - call FillAudioRAM2 - ld hl, wChannelPitchBendLengthModifiers - call FillAudioRAM2 - ld hl, wChannelPitchBendFrequencySteps - call FillAudioRAM2 - ld hl, wChannelPitchBendFrequencyStepsFractionalPart - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyHighBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendCurrentFrequencyLowBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendTargetFrequencyHighBytes - call FillAudioRAM2 - ld hl, wChannelPitchBendTargetFrequencyLowBytes - call FillAudioRAM2 + call Audio2_FillMem + ld hl, wChannelPitchSlideLengthModifiers + call Audio2_FillMem + ld hl, wChannelPitchSlideFrequencySteps + call Audio2_FillMem + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart + call Audio2_FillMem + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart + call Audio2_FillMem + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes + call Audio2_FillMem + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes + call Audio2_FillMem + ld hl, wChannelPitchSlideTargetFrequencyHighBytes + call Audio2_FillMem + ld hl, wChannelPitchSlideTargetFrequencyLowBytes + call Audio2_FillMem ld a, $1 ld hl, wChannelLoopCounters - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelNoteDelayCounters - call FillAudioRAM2 + call Audio2_FillMem ld hl, wChannelNoteSpeeds - call FillAudioRAM2 + call Audio2_FillMem ld [wMusicTempo], a ld a, $ff ld [wStereoPanning], a @@ -271,7 +276,7 @@ Audio2_InitMusicVariables:: ld [rNR50], a ld a, $8 ld [rNR10], a - ld a, $0 + ld a, 0 ld [rNR51], a xor a ld [rNR30], a @@ -304,10 +309,10 @@ Audio2_InitSFXVariables:: ld hl, wChannelFlags1 add hl, de ld [hl], a - ld hl, wChannelDuties + ld hl, wChannelDutyCycles add hl, de ld [hl], a - ld hl, wChannelDutyCycles + ld hl, wChannelDutyCyclePatterns add hl, de ld [hl], a ld hl, wChannelVibratoDelayCounters @@ -325,28 +330,28 @@ Audio2_InitSFXVariables:: ld hl, wChannelVibratoDelayCounterReloadValues add hl, de ld [hl], a - ld hl, wChannelPitchBendLengthModifiers + ld hl, wChannelPitchSlideLengthModifiers add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencySteps + ld hl, wChannelPitchSlideFrequencySteps add hl, de ld [hl], a - ld hl, wChannelPitchBendFrequencyStepsFractionalPart + ld hl, wChannelPitchSlideFrequencyStepsFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyFractionalPart + ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyHighBytes + ld hl, wChannelPitchSlideCurrentFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendCurrentFrequencyLowBytes + ld hl, wChannelPitchSlideCurrentFrequencyLowBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyHighBytes + ld hl, wChannelPitchSlideTargetFrequencyHighBytes add hl, de ld [hl], a - ld hl, wChannelPitchBendTargetFrequencyLowBytes + ld hl, wChannelPitchSlideTargetFrequencyLowBytes add hl, de ld [hl], a ld hl, wChannelFlags2 @@ -363,30 +368,30 @@ Audio2_InitSFXVariables:: add hl, de ld [hl], a ld a, e - cp $4 + cp Ch5 ret nz ld a, $8 - ld [rNR10], a + ld [rNR10], a ; sweep off ret Audio2_StopAllAudio:: ld a, $80 - ld [rNR52], a - ld [rNR30], a + ld [rNR52], a ; sound hardware on + ld [rNR30], a ; wave playback on xor a - ld [rNR51], a - ld [rNR32], a + ld [rNR51], a ; no sound output + ld [rNR32], a ; mute channel 3 (wave channel) ld a, $8 - ld [rNR10], a - ld [rNR12], a - ld [rNR22], a - ld [rNR42], a + ld [rNR10], a ; sweep off + ld [rNR12], a ; mute channel 1 (pulse channel 1) + ld [rNR22], a ; mute channel 2 (pulse channel 2) + ld [rNR42], a ; mute channel 4 (noise channel) ld a, $40 - ld [rNR14], a + ld [rNR14], a ; counter mode ld [rNR24], a ld [rNR44], a ld a, $77 - ld [rNR50], a + ld [rNR50], a ; full volume xor a ld [wUnusedC000], a ld [wDisableChannelOutputWhenSfxEnds], a @@ -397,18 +402,19 @@ Audio2_StopAllAudio:: ld [wSfxWaveInstrument], a ld d, $b0 ld hl, wChannelCommandPointers - call FillAudioRAM2 + call Audio2_FillMem ld a, $1 ld d, $18 ld hl, wChannelNoteDelayCounters - call FillAudioRAM2 + call Audio2_FillMem ld [wMusicTempo], a ld [wSfxTempo], a ld a, $ff ld [wStereoPanning], a ret -FillAudioRAM2: +; fills d bytes at hl with a +Audio2_FillMem ld b, d .loop ld [hli], a diff --git a/audio/engine_3.asm b/audio/engine_3.asm index 418ee10b..2d4a30e3 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -4,21 +4,22 @@ Audio3_PlaySound:: ld [wSoundID], a ld a, [wSoundID] cp $ff - jp z, Audio3_7d18e - cp $c2 - jp z, Audio3_7d12d - jp c, Audio3_7d12d + jp z, .stopAllAudio + cp MAX_SFX_ID_3 + jp z, .playSfx + jp c, .playSfx cp $fd - jr z, .asm_7d127 - jp nc, Audio3_7d12d -.asm_7d127 + jr z, .playMusic + jp nc, .playSfx + +.playMusic call InitMusicVariables - jp Audio3_7d192 + jp .playSoundCommon -Audio3_7d12d: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -33,13 +34,13 @@ Audio3_7d12d: rlca rlca ld c, a -.asm_7d146 +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 + ld b, 0 ld a, [wSfxHeaderPointer] ld h, a ld a, [wSfxHeaderPointer + 1] @@ -48,48 +49,48 @@ Audio3_7d12d: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_7d182 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_7d179 + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_7d172 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret -.asm_7d172 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_7d182 - jr c, .asm_7d182 -.asm_7d179 + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_7d182 - jr c, .asm_7d182 + jr z, .playChannel + jr c, .playChannel ret -.asm_7d182 +.playChannel call InitSFXVariables ld a, c and a - jp z, Audio3_7d192 + jp z, .playSoundCommon dec c - jp .asm_7d146 + jp .sfxChannelLoop -Audio3_7d18e: +.stopAllAudio call StopAllAudio ret -Audio3_7d192: +.playSoundCommon ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -109,26 +110,26 @@ Audio3_7d192: ld b, c inc b inc de - ld c, $0 -.asm_7d1b4 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_7d1bc + jr z, .next inc c inc hl inc hl - jr .asm_7d1b4 -.asm_7d1bc + jr .commandPointerLoop +.next push af push hl push bc - ld b, $0 + ld b, 0 ld c, a - cp $3 - jr c, .asm_7d1cc + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_7d1cc + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -140,7 +141,7 @@ Audio3_7d192: pop af push hl push bc - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc @@ -154,37 +155,37 @@ Audio3_7d192: and a ld a, [de] inc de - jr nz, .asm_7d1b4 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_7d1f5 - jr .asm_7d21f -.asm_7d1f5 + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_7d21f - jr c, .asm_7d200 - jr .asm_7d21f -.asm_7d200 - ld hl, wChannelSoundIDs + CH4 + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer - ld de, Noise3_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio3_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_7d21f + jr nz, .done ld a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a -.asm_7d21f + ld [rNR50], a ; full volume +.done ret -Noise3_endchannel: - endchannel +Audio3_CryRet: + sound_ret diff --git a/audio/engine_4.asm b/audio/engine_4.asm index f152ff80..2f0d9ade 100644 --- a/audio/engine_4.asm +++ b/audio/engine_4.asm @@ -1,24 +1,25 @@ +; The fourth of three duplicated sound engines. + Audio4_PlaySound:: -; Duplicate of Audio3_PlaySound ld [wSoundID], a ld a, [wSoundID] cp $ff - jp z, Audio4_7d18e - cp $98 - jp z, Audio4_7d12d - jp c, Audio4_7d12d + jp z, .stopAllAudio + cp MAX_SFX_ID_4 + jp z, .playSfx + jp c, .playSfx cp $a3 - jr z, .asm_7d127 - jp nc, Audio4_7d12d + jr z, .playMusic + jp nc, .playSfx -.asm_7d127 +.playMusic call InitMusicVariables - jp Audio4_7d192 + jp .playSoundCommon -Audio4_7d12d: +.playSfx ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -33,13 +34,13 @@ Audio4_7d12d: rlca rlca ld c, a -.asm_7d146 +.sfxChannelLoop ld d, c ld a, c add a add c ld c, a - ld b, $0 + ld b, 0 ld a, [wSfxHeaderPointer] ld h, a ld a, [wSfxHeaderPointer + 1] @@ -48,50 +49,48 @@ Audio4_7d12d: ld c, d ld a, [hl] and $f - ld e, a - ld d, $0 + ld e, a ; software channel ID + ld d, 0 ld hl, wChannelSoundIDs add hl, de ld a, [hl] and a - jr z, .asm_7d182 + jr z, .playChannel ld a, e - cp $7 - jr nz, .asm_7d179 + cp Ch8 + jr nz, .notNoiseChannel ld a, [wSoundID] - cp $14 - jr nc, .asm_7d172 + cp NOISE_INSTRUMENTS_END + jr nc, .notNoiseInstrument ret - -.asm_7d172 +.notNoiseInstrument ld a, [hl] - cp $14 - jr z, .asm_7d182 - jr c, .asm_7d182 -.asm_7d179 + cp NOISE_INSTRUMENTS_END + jr z, .playChannel + jr c, .playChannel +.notNoiseChannel ld a, [wSoundID] cp [hl] - jr z, .asm_7d182 - jr c, .asm_7d182 + jr z, .playChannel + jr c, .playChannel ret - -.asm_7d182 +.playChannel call InitSFXVariables ld a, c and a - jp z, Audio4_7d192 + jp z, .playSoundCommon dec c - jp .asm_7d146 + jp .sfxChannelLoop -Audio4_7d18e: +.stopAllAudio call StopAllAudio ret -Audio4_7d192: +.playSoundCommon ld a, [wSoundID] ld l, a ld e, a - ld h, $0 + ld h, 0 ld d, h add hl, hl add hl, de @@ -111,26 +110,26 @@ Audio4_7d192: ld b, c inc b inc de - ld c, $0 -.asm_7d1b4 + ld c, 0 +.commandPointerLoop cp c - jr z, .asm_7d1bc + jr z, .next inc c inc hl inc hl - jr .asm_7d1b4 -.asm_7d1bc + jr .commandPointerLoop +.next push af push hl push bc - ld b, $0 + ld b, 0 ld c, a - cp $3 - jr c, .asm_7d1cc + cp Ch4 + jr c, .skipSettingFlag ld hl, wChannelFlags1 add hl, bc - set 2, [hl] -.asm_7d1cc + set BIT_NOISE_OR_SFX, [hl] +.skipSettingFlag pop bc pop hl ld a, [de] ; get channel pointer @@ -142,7 +141,7 @@ Audio4_7d192: pop af push hl push bc - ld b, $0 + ld b, 0 ld c, a ld hl, wChannelSoundIDs add hl, bc @@ -156,38 +155,37 @@ Audio4_7d192: and a ld a, [de] inc de - jr nz, .asm_7d1b4 + jr nz, .commandPointerLoop ld a, [wSoundID] - cp $14 - jr nc, .asm_7d1f5 - jr .asm_7d21f - -.asm_7d1f5 + cp CRY_SFX_START + jr nc, .maybeCry + jr .done +.maybeCry ld a, [wSoundID] - cp $86 - jr z, .asm_7d21f - jr c, .asm_7d200 - jr .asm_7d21f -.asm_7d200 - ld hl, wChannelSoundIDs + CH4 + cp CRY_SFX_END + jr z, .done + jr c, .cry + jr .done +.cry + ld hl, wChannelSoundIDs + Ch5 ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, wChannelCommandPointers + CH6 * 2 ; sfx noise channel pointer - ld de, Noise4_endchannel + ld hl, wChannelCommandPointers + Ch7 * 2 ; sfx wave channel pointer + ld de, Audio4_CryRet ld [hl], e inc hl - ld [hl], d ; overwrite pointer to point to endchannel + ld [hl], d ; overwrite pointer to point to sound_ret ld a, [wSavedVolume] and a - jr nz, .asm_7d21f + jr nz, .done ld a, [rNR50] ld [wSavedVolume], a ld a, $77 - ld [rNR50], a -.asm_7d21f + ld [rNR50], a ; full volume +.done ret -Noise4_endchannel: - endchannel +Audio4_CryRet: + sound_ret diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm index 665efceb..ef85eae6 100644 --- a/audio/headers/musicheaders1.asm +++ b/audio/headers/musicheaders1.asm @@ -1,115 +1,66 @@ Music_PalletTown:: - dbw ( $80 | CH0 ), Music_PalletTown_Ch1 - dbw CH1, Music_PalletTown_Ch2 - dbw CH2, Music_PalletTown_Ch3 + audio_header Music_PalletTown, Ch1, Ch2, Ch3 Music_Pokecenter:: - dbw ( $80 | CH0 ), Music_Pokecenter_Ch1 - dbw CH1, Music_Pokecenter_Ch2 - dbw CH2, Music_Pokecenter_Ch3 + audio_header Music_Pokecenter, Ch1, Ch2, Ch3 Music_Gym:: - dbw ( $80 | CH0 ), Music_Gym_Ch1 - dbw CH1, Music_Gym_Ch2 - dbw CH2, Music_Gym_Ch3 + audio_header Music_Gym, Ch1, Ch2, Ch3 ; Viridian City, Pewter City, Saffron City Music_Cities1:: - dbw ( $C0 | CH0 ), Music_Cities1_Ch1 - dbw CH1, Music_Cities1_Ch2 - dbw CH2, Music_Cities1_Ch3 - dbw CH3, Music_Cities1_Ch4 + audio_header Music_Cities1, Ch1, Ch2, Ch3, Ch4 ; Cerulean City, Fuchsia City Music_Cities2:: - dbw ( $80 | CH0 ), Music_Cities2_Ch1 - dbw CH1, Music_Cities2_Ch2 - dbw CH2, Music_Cities2_Ch3 + audio_header Music_Cities2, Ch1, Ch2, Ch3 Music_Celadon:: - dbw ( $80 | CH0 ), Music_Celadon_Ch1 - dbw CH1, Music_Celadon_Ch2 - dbw CH2, Music_Celadon_Ch3 + audio_header Music_Celadon, Ch1, Ch2, Ch3 Music_Cinnabar:: - dbw ( $80 | CH0 ), Music_Cinnabar_Ch1 - dbw CH1, Music_Cinnabar_Ch2 - dbw CH2, Music_Cinnabar_Ch3 + audio_header Music_Cinnabar, Ch1, Ch2, Ch3 Music_Vermilion:: - dbw ( $C0 | CH0 ), Music_Vermilion_Ch1 - dbw CH1, Music_Vermilion_Ch2 - dbw CH2, Music_Vermilion_Ch3 - dbw CH3, Music_Vermilion_Ch4 + audio_header Music_Vermilion, Ch1, Ch2, Ch3, Ch4 Music_Lavender:: - dbw ( $C0 | CH0 ), Music_Lavender_Ch1 - dbw CH1, Music_Lavender_Ch2 - dbw CH2, Music_Lavender_Ch3 - dbw CH3, Music_Lavender_Ch4 + audio_header Music_Lavender, Ch1, Ch2, Ch3, Ch4 Music_SSAnne:: - dbw ( $80 | CH0 ), Music_SSAnne_Ch1 - dbw CH1, Music_SSAnne_Ch2 - dbw CH2, Music_SSAnne_Ch3 + audio_header Music_SSAnne, Ch1, Ch2, Ch3 Music_MeetProfOak:: - dbw ( $80 | CH0 ), Music_MeetProfOak_Ch1 - dbw CH1, Music_MeetProfOak_Ch2 - dbw CH2, Music_MeetProfOak_Ch3 + audio_header Music_MeetProfOak, Ch1, Ch2, Ch3 Music_MeetRival:: - dbw ( $80 | CH0 ), Music_MeetRival_Ch1 - dbw CH1, Music_MeetRival_Ch2 - dbw CH2, Music_MeetRival_Ch3 + audio_header Music_MeetRival, Ch1, Ch2, Ch3 Music_MuseumGuy:: - dbw ( $C0 | CH0 ), Music_MuseumGuy_Ch1 - dbw CH1, Music_MuseumGuy_Ch2 - dbw CH2, Music_MuseumGuy_Ch3 - dbw CH3, Music_MuseumGuy_Ch4 + audio_header Music_MuseumGuy, Ch1, Ch2, Ch3, Ch4 Music_SafariZone:: - dbw ( $80 | CH0 ), Music_SafariZone_Ch1 - dbw CH1, Music_SafariZone_Ch2 - dbw CH2, Music_SafariZone_Ch3 + audio_header Music_SafariZone, Ch1, Ch2, Ch3 Music_PkmnHealed:: - dbw ( $80 | CH0 ), Music_PkmnHealed_Ch1 - dbw CH1, Music_PkmnHealed_Ch2 - dbw CH2, Music_PkmnHealed_Ch3 + audio_header Music_PkmnHealed, Ch1, Ch2, Ch3 ; Routes 1 and 2 Music_Routes1:: - dbw ( $C0 | CH0 ), Music_Routes1_Ch1 - dbw CH1, Music_Routes1_Ch2 - dbw CH2, Music_Routes1_Ch3 - dbw CH3, Music_Routes1_Ch4 + audio_header Music_Routes1, Ch1, Ch2, Ch3, Ch4 ; Routes 24 and 25 Music_Routes2:: - dbw ( $C0 | CH0 ), Music_Routes2_Ch1 - dbw CH1, Music_Routes2_Ch2 - dbw CH2, Music_Routes2_Ch3 - dbw CH3, Music_Routes2_Ch4 + audio_header Music_Routes2, Ch1, Ch2, Ch3, Ch4 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 Music_Routes3:: - dbw ( $C0 | CH0 ), Music_Routes3_Ch1 - dbw CH1, Music_Routes3_Ch2 - dbw CH2, Music_Routes3_Ch3 - dbw CH3, Music_Routes3_Ch4 + audio_header Music_Routes3, Ch1, Ch2, Ch3, Ch4 ; Routes 11, 12, 13, 14, 15 Music_Routes4:: - dbw ( $C0 | CH0 ), Music_Routes4_Ch1 - dbw CH1, Music_Routes4_Ch2 - dbw CH2, Music_Routes4_Ch3 - dbw CH3, Music_Routes4_Ch4 + audio_header Music_Routes4, Ch1, Ch2, Ch3, Ch4 ; Route 23, Indigo Plateau Music_IndigoPlateau:: - dbw ( $C0 | CH0 ), Music_IndigoPlateau_Ch1 - dbw CH1, Music_IndigoPlateau_Ch2 - dbw CH2, Music_IndigoPlateau_Ch3 - dbw CH3, Music_IndigoPlateau_Ch4 + audio_header Music_IndigoPlateau, Ch1, Ch2, Ch3, Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm index 7df3f8bf..d6cca9a9 100644 --- a/audio/headers/musicheaders2.asm +++ b/audio/headers/musicheaders2.asm @@ -1,34 +1,20 @@ Music_GymLeaderBattle:: - dbw ( $80 | CH0 ), Music_GymLeaderBattle_Ch1 - dbw CH1, Music_GymLeaderBattle_Ch2 - dbw CH2, Music_GymLeaderBattle_Ch3 + audio_header Music_GymLeaderBattle, Ch1, Ch2, Ch3 Music_TrainerBattle:: - dbw ( $80 | CH0 ), Music_TrainerBattle_Ch1 - dbw CH1, Music_TrainerBattle_Ch2 - dbw CH2, Music_TrainerBattle_Ch3 + audio_header Music_TrainerBattle, Ch1, Ch2, Ch3 Music_WildBattle:: - dbw ( $80 | CH0 ), Music_WildBattle_Ch1 - dbw CH1, Music_WildBattle_Ch2 - dbw CH2, Music_WildBattle_Ch3 + audio_header Music_WildBattle, Ch1, Ch2, Ch3 Music_FinalBattle:: - dbw ( $80 | CH0 ), Music_FinalBattle_Ch1 - dbw CH1, Music_FinalBattle_Ch2 - dbw CH2, Music_FinalBattle_Ch3 + audio_header Music_FinalBattle, Ch1, Ch2, Ch3 Music_DefeatedTrainer:: - dbw ( $80 | CH0 ), Music_DefeatedTrainer_Ch1 - dbw CH1, Music_DefeatedTrainer_Ch2 - dbw CH2, Music_DefeatedTrainer_Ch3 + audio_header Music_DefeatedTrainer, Ch1, Ch2, Ch3 Music_DefeatedWildMon:: - dbw ( $80 | CH0 ), Music_DefeatedWildMon_Ch1 - dbw CH1, Music_DefeatedWildMon_Ch2 - dbw CH2, Music_DefeatedWildMon_Ch3 + audio_header Music_DefeatedWildMon, Ch1, Ch2, Ch3 Music_DefeatedGymLeader:: - dbw ( $80 | CH0 ), Music_DefeatedGymLeader_Ch1 - dbw CH1, Music_DefeatedGymLeader_Ch2 - dbw CH2, Music_DefeatedGymLeader_Ch3 + audio_header Music_DefeatedGymLeader, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm index c694be9b..51c67966 100644 --- a/audio/headers/musicheaders3.asm +++ b/audio/headers/musicheaders3.asm @@ -1,97 +1,56 @@ Music_TitleScreen:: - dbw ( $C0 | CH0 ), Music_TitleScreen_Ch1 - dbw CH1, Music_TitleScreen_Ch2 - dbw CH2, Music_TitleScreen_Ch3 - dbw CH3, Music_TitleScreen_Ch4 + audio_header Music_TitleScreen, Ch1, Ch2, Ch3, Ch4 Music_Credits:: - dbw ( $80 | CH0 ), Music_Credits_Ch1 - dbw CH1, Music_Credits_Ch2 - dbw CH2, Music_Credits_Ch3 + audio_header Music_Credits, Ch1, Ch2, Ch3 Music_HallOfFame:: - dbw ( $80 | CH0 ), Music_HallOfFame_Ch1 - dbw CH1, Music_HallOfFame_Ch2 - dbw CH2, Music_HallOfFame_Ch3 + audio_header Music_HallOfFame, Ch1, Ch2, Ch3 Music_OaksLab:: - dbw ( $80 | CH0 ), Music_OaksLab_Ch1 - dbw CH1, Music_OaksLab_Ch2 - dbw CH2, Music_OaksLab_Ch3 + audio_header Music_OaksLab, Ch1, Ch2, Ch3 Music_JigglypuffSong:: - dbw $40, Music_JigglypuffSong_Ch1 - dbw CH1, Music_JigglypuffSong_Ch2 + audio_header Music_JigglypuffSong, Ch1, Ch2 Music_BikeRiding:: - dbw ( $C0 | CH0 ), Music_BikeRiding_Ch1 - dbw CH1, Music_BikeRiding_Ch2 - dbw CH2, Music_BikeRiding_Ch3 - dbw CH3, Music_BikeRiding_Ch4 + audio_header Music_BikeRiding, Ch1, Ch2, Ch3, Ch4 Music_Surfing:: - dbw ( $80 | CH0 ), Music_Surfing_Ch1 - dbw CH1, Music_Surfing_Ch2 - dbw CH2, Music_Surfing_Ch3 + audio_header Music_Surfing, Ch1, Ch2, Ch3 Music_GameCorner:: - dbw ( $80 | CH0 ), Music_GameCorner_Ch1 - dbw CH1, Music_GameCorner_Ch2 - dbw CH2, Music_GameCorner_Ch3 + audio_header Music_GameCorner, Ch1, Ch2, Ch3 -Music_IntroBattle:: - dbw ( $80 | CH0 ), Music_YellowIntro_Ch1 - dbw CH1, Music_YellowIntro_Ch2 - dbw CH2, Music_YellowIntro_Ch3 +Music_YellowIntro:: + audio_header Music_YellowIntro, Ch1, Ch2, Ch3 -; Power Plant, Unknown Dungeon, Rocket HQ +; Power Plant, Cerulean Cave, Rocket HQ Music_Dungeon1:: - dbw ( $C0 | CH0 ), Music_Dungeon1_Ch1 - dbw CH1, Music_Dungeon1_Ch2 - dbw CH2, Music_Dungeon1_Ch3 - dbw CH3, Music_Dungeon1_Ch4 + audio_header Music_Dungeon1, Ch1, Ch2, Ch3, Ch4 ; Viridian Forest, Seafoam Islands Music_Dungeon2:: - dbw ( $C0 | CH0 ), Music_Dungeon2_Ch1 - dbw CH1, Music_Dungeon2_Ch2 - dbw CH2, Music_Dungeon2_Ch3 - dbw CH3, Music_Dungeon2_Ch4 + audio_header Music_Dungeon2, Ch1, Ch2, Ch3, Ch4 ; Mt. Moon, Rock Tunnel, Victory Road Music_Dungeon3:: - dbw ( $C0 | CH0 ), Music_Dungeon3_Ch1 - dbw CH1, Music_Dungeon3_Ch2 - dbw CH2, Music_Dungeon3_Ch3 - dbw CH3, Music_Dungeon3_Ch4 + audio_header Music_Dungeon3, Ch1, Ch2, Ch3, Ch4 Music_CinnabarMansion:: - dbw ( $C0 | CH0 ), Music_CinnabarMansion_Ch1 - dbw CH1, Music_CinnabarMansion_Ch2 - dbw CH2, Music_CinnabarMansion_Ch3 - dbw CH3, Music_CinnabarMansion_Ch4 + audio_header Music_CinnabarMansion, Ch1, Ch2, Ch3, Ch4 Music_PokemonTower:: - dbw ( $80 | CH0 ), Music_PokemonTower_Ch1 - dbw CH1, Music_PokemonTower_Ch2 - dbw CH2, Music_PokemonTower_Ch3 + audio_header Music_PokemonTower, Ch1, Ch2, Ch3 Music_SilphCo:: - dbw ( $80 | CH0 ), Music_SilphCo_Ch1 - dbw CH1, Music_SilphCo_Ch2 - dbw CH2, Music_SilphCo_Ch3 + audio_header Music_SilphCo, Ch1, Ch2, Ch3 Music_MeetEvilTrainer:: - dbw ( $80 | CH0 ), Music_MeetEvilTrainer_Ch1 - dbw CH1, Music_MeetEvilTrainer_Ch2 - dbw CH2, Music_MeetEvilTrainer_Ch3 + audio_header Music_MeetEvilTrainer, Ch1, Ch2, Ch3 Music_MeetFemaleTrainer:: - dbw ( $80 | CH0 ), Music_MeetFemaleTrainer_Ch1 - dbw CH1, Music_MeetFemaleTrainer_Ch2 - dbw CH2, Music_MeetFemaleTrainer_Ch3 + audio_header Music_MeetFemaleTrainer, Ch1, Ch2, Ch3 Music_MeetMaleTrainer:: - dbw ( $80 | CH0 ), Music_MeetMaleTrainer_Ch1 - dbw CH1, Music_MeetMaleTrainer_Ch2 - dbw CH2, Music_MeetMaleTrainer_Ch3 + audio_header Music_MeetMaleTrainer, Ch1, Ch2, Ch3 diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index be5d822a..8c537ff9 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -1,18 +1,11 @@ Music_SurfingPikachu:: - dbw ((3 - 1) << 6) | CH0, Music_SurfingPikachu_Ch1 - dbw CH1, Music_SurfingPikachu_Ch2 - dbw CH2, Music_SurfingPikachu_Ch3 + audio_header Music_SurfingPikachu, Ch1, Ch2, Ch3 Music_MeetJessieJames:: - dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1 - dbw CH1, Music_MeetJessieJames_Ch2 - dbw CH2, Music_MeetJessieJames_Ch3 + audio_header Music_MeetJessieJames, Ch1, Ch2, Ch3 Music_YellowUnusedSong:: - dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1 - dbw CH1, Music_YellowUnusedSong_Ch2 - dbw CH2, Music_YellowUnusedSong_Ch3 - dbw CH3, Music_YellowUnusedSong_Ch4 + audio_header Music_YellowUnusedSong, Ch1, Ch2, Ch3, Ch4 Music_GBPrinter:: - dbw ((1 - 1) << 6) | CH2, Music_GBPrinter_Ch3 + audio_header Music_GBPrinter, Ch3 diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index fdbcb5f3..de0d3b89 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,377 +1,288 @@ SFX_Headers_1:: dbw -1, -1 ; padding -SFX_Snare1_1:: - dbw CH7, SFX_Snare1_1_Ch1 +SFX_Noise_Instrument01_1:: + audio_header SFX_Noise_Instrument01_1, Ch8 -SFX_Snare2_1:: - dbw CH7, SFX_Snare2_1_Ch1 +SFX_Noise_Instrument02_1:: + audio_header SFX_Noise_Instrument02_1, Ch8 -SFX_Snare3_1:: - dbw CH7, SFX_Snare3_1_Ch1 +SFX_Noise_Instrument03_1:: + audio_header SFX_Noise_Instrument03_1, Ch8 -SFX_Snare4_1:: - dbw CH7, SFX_Snare4_1_Ch1 +SFX_Noise_Instrument04_1:: + audio_header SFX_Noise_Instrument04_1, Ch8 -SFX_Snare5_1:: - dbw CH7, SFX_Snare5_1_Ch1 +SFX_Noise_Instrument05_1:: + audio_header SFX_Noise_Instrument05_1, Ch8 -SFX_Triangle1_1:: - dbw CH7, SFX_Triangle1_1_Ch1 +SFX_Noise_Instrument06_1:: + audio_header SFX_Noise_Instrument06_1, Ch8 -SFX_Triangle2_1:: - dbw CH7, SFX_Triangle2_1_Ch1 +SFX_Noise_Instrument07_1:: + audio_header SFX_Noise_Instrument07_1, Ch8 -SFX_Snare6_1:: - dbw CH7, SFX_Snare6_1_Ch1 +SFX_Noise_Instrument08_1:: + audio_header SFX_Noise_Instrument08_1, Ch8 -SFX_Snare7_1:: - dbw CH7, SFX_Snare7_1_Ch1 +SFX_Noise_Instrument09_1:: + audio_header SFX_Noise_Instrument09_1, Ch8 -SFX_Snare8_1:: - dbw CH7, SFX_Snare8_1_Ch1 +SFX_Noise_Instrument10_1:: + audio_header SFX_Noise_Instrument10_1, Ch8 -SFX_Snare9_1:: - dbw CH7, SFX_Snare9_1_Ch1 +SFX_Noise_Instrument11_1:: + audio_header SFX_Noise_Instrument11_1, Ch8 -SFX_Cymbal1_1:: - dbw CH7, SFX_Cymbal1_1_Ch1 +SFX_Noise_Instrument12_1:: + audio_header SFX_Noise_Instrument12_1, Ch8 -SFX_Cymbal2_1:: - dbw CH7, SFX_Cymbal2_1_Ch1 +SFX_Noise_Instrument13_1:: + audio_header SFX_Noise_Instrument13_1, Ch8 -SFX_Cymbal3_1:: - dbw CH7, SFX_Cymbal3_1_Ch1 +SFX_Noise_Instrument14_1:: + audio_header SFX_Noise_Instrument14_1, Ch8 -SFX_Muted_Snare1_1:: - dbw CH7, SFX_Muted_Snare1_1_Ch1 +SFX_Noise_Instrument15_1:: + audio_header SFX_Noise_Instrument15_1, Ch8 -SFX_Triangle3_1:: - dbw CH7, SFX_Triangle3_1_Ch1 +SFX_Noise_Instrument16_1:: + audio_header SFX_Noise_Instrument16_1, Ch8 -SFX_Muted_Snare2_1:: - dbw CH7, SFX_Muted_Snare2_1_Ch1 +SFX_Noise_Instrument17_1:: + audio_header SFX_Noise_Instrument17_1, Ch8 -SFX_Muted_Snare3_1:: - dbw CH7, SFX_Muted_Snare3_1_Ch1 +SFX_Noise_Instrument18_1:: + audio_header SFX_Noise_Instrument18_1, Ch8 -SFX_Muted_Snare4_1:: - dbw CH7, SFX_Muted_Snare4_1_Ch1 +SFX_Noise_Instrument19_1:: + audio_header SFX_Noise_Instrument19_1, Ch8 SFX_Cry00_1:: - dbw ( $80 | CH4 ), SFX_Cry00_1_Ch1 - dbw CH5, SFX_Cry00_1_Ch2 - dbw CH7, SFX_Cry00_1_Ch3 + audio_header SFX_Cry00_1, Ch5, Ch6, Ch8 SFX_Cry01_1:: - dbw ( $80 | CH4 ), SFX_Cry01_1_Ch1 - dbw CH5, SFX_Cry01_1_Ch2 - dbw CH7, SFX_Cry01_1_Ch3 + audio_header SFX_Cry01_1, Ch5, Ch6, Ch8 SFX_Cry02_1:: - dbw ( $80 | CH4 ), SFX_Cry02_1_Ch1 - dbw CH5, SFX_Cry02_1_Ch2 - dbw CH7, SFX_Cry02_1_Ch3 + audio_header SFX_Cry02_1, Ch5, Ch6, Ch8 SFX_Cry03_1:: - dbw ( $80 | CH4 ), SFX_Cry03_1_Ch1 - dbw CH5, SFX_Cry03_1_Ch2 - dbw CH7, SFX_Cry03_1_Ch3 + audio_header SFX_Cry03_1, Ch5, Ch6, Ch8 SFX_Cry04_1:: - dbw ( $80 | CH4 ), SFX_Cry04_1_Ch1 - dbw CH5, SFX_Cry04_1_Ch2 - dbw CH7, SFX_Cry04_1_Ch3 + audio_header SFX_Cry04_1, Ch5, Ch6, Ch8 SFX_Cry05_1:: - dbw ( $80 | CH4 ), SFX_Cry05_1_Ch1 - dbw CH5, SFX_Cry05_1_Ch2 - dbw CH7, SFX_Cry05_1_Ch3 + audio_header SFX_Cry05_1, Ch5, Ch6, Ch8 SFX_Cry06_1:: - dbw ( $80 | CH4 ), SFX_Cry06_1_Ch1 - dbw CH5, SFX_Cry06_1_Ch2 - dbw CH7, SFX_Cry06_1_Ch3 + audio_header SFX_Cry06_1, Ch5, Ch6, Ch8 SFX_Cry07_1:: - dbw ( $80 | CH4 ), SFX_Cry07_1_Ch1 - dbw CH5, SFX_Cry07_1_Ch2 - dbw CH7, SFX_Cry07_1_Ch3 + audio_header SFX_Cry07_1, Ch5, Ch6, Ch8 SFX_Cry08_1:: - dbw ( $80 | CH4 ), SFX_Cry08_1_Ch1 - dbw CH5, SFX_Cry08_1_Ch2 - dbw CH7, SFX_Cry08_1_Ch3 + audio_header SFX_Cry08_1, Ch5, Ch6, Ch8 SFX_Cry09_1:: - dbw ( $80 | CH4 ), SFX_Cry09_1_Ch1 - dbw CH5, SFX_Cry09_1_Ch2 - dbw CH7, SFX_Cry09_1_Ch3 + audio_header SFX_Cry09_1, Ch5, Ch6, Ch8 SFX_Cry0A_1:: - dbw ( $80 | CH4 ), SFX_Cry0A_1_Ch1 - dbw CH5, SFX_Cry0A_1_Ch2 - dbw CH7, SFX_Cry0A_1_Ch3 + audio_header SFX_Cry0A_1, Ch5, Ch6, Ch8 SFX_Cry0B_1:: - dbw ( $80 | CH4 ), SFX_Cry0B_1_Ch1 - dbw CH5, SFX_Cry0B_1_Ch2 - dbw CH7, SFX_Cry0B_1_Ch3 + audio_header SFX_Cry0B_1, Ch5, Ch6, Ch8 SFX_Cry0C_1:: - dbw ( $80 | CH4 ), SFX_Cry0C_1_Ch1 - dbw CH5, SFX_Cry0C_1_Ch2 - dbw CH7, SFX_Cry0C_1_Ch3 + audio_header SFX_Cry0C_1, Ch5, Ch6, Ch8 SFX_Cry0D_1:: - dbw ( $80 | CH4 ), SFX_Cry0D_1_Ch1 - dbw CH5, SFX_Cry0D_1_Ch2 - dbw CH7, SFX_Cry0D_1_Ch3 + audio_header SFX_Cry0D_1, Ch5, Ch6, Ch8 SFX_Cry0E_1:: - dbw ( $80 | CH4 ), SFX_Cry0E_1_Ch1 - dbw CH5, SFX_Cry0E_1_Ch2 - dbw CH7, SFX_Cry0E_1_Ch3 + audio_header SFX_Cry0E_1, Ch5, Ch6, Ch8 SFX_Cry0F_1:: - dbw ( $80 | CH4 ), SFX_Cry0F_1_Ch1 - dbw CH5, SFX_Cry0F_1_Ch2 - dbw CH7, SFX_Cry0F_1_Ch3 + audio_header SFX_Cry0F_1, Ch5, Ch6, Ch8 SFX_Cry10_1:: - dbw ( $80 | CH4 ), SFX_Cry10_1_Ch1 - dbw CH5, SFX_Cry10_1_Ch2 - dbw CH7, SFX_Cry10_1_Ch3 + audio_header SFX_Cry10_1, Ch5, Ch6, Ch8 SFX_Cry11_1:: - dbw ( $80 | CH4 ), SFX_Cry11_1_Ch1 - dbw CH5, SFX_Cry11_1_Ch2 - dbw CH7, SFX_Cry11_1_Ch3 + audio_header SFX_Cry11_1, Ch5, Ch6, Ch8 SFX_Cry12_1:: - dbw ( $80 | CH4 ), SFX_Cry12_1_Ch1 - dbw CH5, SFX_Cry12_1_Ch2 - dbw CH7, SFX_Cry12_1_Ch3 + audio_header SFX_Cry12_1, Ch5, Ch6, Ch8 SFX_Cry13_1:: - dbw ( $80 | CH4 ), SFX_Cry13_1_Ch1 - dbw CH5, SFX_Cry13_1_Ch2 - dbw CH7, SFX_Cry13_1_Ch3 + audio_header SFX_Cry13_1, Ch5, Ch6, Ch8 SFX_Cry14_1:: - dbw ( $80 | CH4 ), SFX_Cry14_1_Ch1 - dbw CH5, SFX_Cry14_1_Ch2 - dbw CH7, SFX_Cry14_1_Ch3 + audio_header SFX_Cry14_1, Ch5, Ch6, Ch8 SFX_Cry15_1:: - dbw ( $80 | CH4 ), SFX_Cry15_1_Ch1 - dbw CH5, SFX_Cry15_1_Ch2 - dbw CH7, SFX_Cry15_1_Ch3 + audio_header SFX_Cry15_1, Ch5, Ch6, Ch8 SFX_Cry16_1:: - dbw ( $80 | CH4 ), SFX_Cry16_1_Ch1 - dbw CH5, SFX_Cry16_1_Ch2 - dbw CH7, SFX_Cry16_1_Ch3 + audio_header SFX_Cry16_1, Ch5, Ch6, Ch8 SFX_Cry17_1:: - dbw ( $80 | CH4 ), SFX_Cry17_1_Ch1 - dbw CH5, SFX_Cry17_1_Ch2 - dbw CH7, SFX_Cry17_1_Ch3 + audio_header SFX_Cry17_1, Ch5, Ch6, Ch8 SFX_Cry18_1:: - dbw ( $80 | CH4 ), SFX_Cry18_1_Ch1 - dbw CH5, SFX_Cry18_1_Ch2 - dbw CH7, SFX_Cry18_1_Ch3 + audio_header SFX_Cry18_1, Ch5, Ch6, Ch8 SFX_Cry19_1:: - dbw ( $80 | CH4 ), SFX_Cry19_1_Ch1 - dbw CH5, SFX_Cry19_1_Ch2 - dbw CH7, SFX_Cry19_1_Ch3 + audio_header SFX_Cry19_1, Ch5, Ch6, Ch8 SFX_Cry1A_1:: - dbw ( $80 | CH4 ), SFX_Cry1A_1_Ch1 - dbw CH5, SFX_Cry1A_1_Ch2 - dbw CH7, SFX_Cry1A_1_Ch3 + audio_header SFX_Cry1A_1, Ch5, Ch6, Ch8 SFX_Cry1B_1:: - dbw ( $80 | CH4 ), SFX_Cry1B_1_Ch1 - dbw CH5, SFX_Cry1B_1_Ch2 - dbw CH7, SFX_Cry1B_1_Ch3 + audio_header SFX_Cry1B_1, Ch5, Ch6, Ch8 SFX_Cry1C_1:: - dbw ( $80 | CH4 ), SFX_Cry1C_1_Ch1 - dbw CH5, SFX_Cry1C_1_Ch2 - dbw CH7, SFX_Cry1C_1_Ch3 + audio_header SFX_Cry1C_1, Ch5, Ch6, Ch8 SFX_Cry1D_1:: - dbw ( $80 | CH4 ), SFX_Cry1D_1_Ch1 - dbw CH5, SFX_Cry1D_1_Ch2 - dbw CH7, SFX_Cry1D_1_Ch3 + audio_header SFX_Cry1D_1, Ch5, Ch6, Ch8 SFX_Cry1E_1:: - dbw ( $80 | CH4 ), SFX_Cry1E_1_Ch1 - dbw CH5, SFX_Cry1E_1_Ch2 - dbw CH7, SFX_Cry1E_1_Ch3 + audio_header SFX_Cry1E_1, Ch5, Ch6, Ch8 SFX_Cry1F_1:: - dbw ( $80 | CH4 ), SFX_Cry1F_1_Ch1 - dbw CH5, SFX_Cry1F_1_Ch2 - dbw CH7, SFX_Cry1F_1_Ch3 + audio_header SFX_Cry1F_1, Ch5, Ch6, Ch8 SFX_Cry20_1:: - dbw ( $80 | CH4 ), SFX_Cry20_1_Ch1 - dbw CH5, SFX_Cry20_1_Ch2 - dbw CH7, SFX_Cry20_1_Ch3 + audio_header SFX_Cry20_1, Ch5, Ch6, Ch8 SFX_Cry21_1:: - dbw ( $80 | CH4 ), SFX_Cry21_1_Ch1 - dbw CH5, SFX_Cry21_1_Ch2 - dbw CH7, SFX_Cry21_1_Ch3 + audio_header SFX_Cry21_1, Ch5, Ch6, Ch8 SFX_Cry22_1:: - dbw ( $80 | CH4 ), SFX_Cry22_1_Ch1 - dbw CH5, SFX_Cry22_1_Ch2 - dbw CH7, SFX_Cry22_1_Ch3 + audio_header SFX_Cry22_1, Ch5, Ch6, Ch8 SFX_Cry23_1:: - dbw ( $80 | CH4 ), SFX_Cry23_1_Ch1 - dbw CH5, SFX_Cry23_1_Ch2 - dbw CH7, SFX_Cry23_1_Ch3 + audio_header SFX_Cry23_1, Ch5, Ch6, Ch8 SFX_Cry24_1:: - dbw ( $80 | CH4 ), SFX_Cry24_1_Ch1 - dbw CH5, SFX_Cry24_1_Ch2 - dbw CH7, SFX_Cry24_1_Ch3 + audio_header SFX_Cry24_1, Ch5, Ch6, Ch8 SFX_Cry25_1:: - dbw ( $80 | CH4 ), SFX_Cry25_1_Ch1 - dbw CH5, SFX_Cry25_1_Ch2 - dbw CH7, SFX_Cry25_1_Ch3 + audio_header SFX_Cry25_1, Ch5, Ch6, Ch8 SFX_Get_Item1_1:: - dbw ( $80 | CH4 ), SFX_Get_Item1_1_Ch1 - dbw CH5, SFX_Get_Item1_1_Ch2 - dbw CH6, SFX_Get_Item1_1_Ch3 + audio_header SFX_Get_Item1_1, Ch5, Ch6, Ch7 SFX_Get_Item2_1:: - dbw ( $80 | CH4 ), SFX_Get_Item2_1_Ch1 - dbw CH5, SFX_Get_Item2_1_Ch2 - dbw CH6, SFX_Get_Item2_1_Ch3 + audio_header SFX_Get_Item2_1, Ch5, Ch6, Ch7 SFX_Tink_1:: - dbw CH4, SFX_Tink_1_Ch1 + audio_header SFX_Tink_1, Ch5 SFX_Heal_HP_1:: - dbw CH4, SFX_Heal_HP_1_Ch1 + audio_header SFX_Heal_HP_1, Ch5 SFX_Heal_Ailment_1:: - dbw CH4, SFX_Heal_Ailment_1_Ch1 + audio_header SFX_Heal_Ailment_1, Ch5 SFX_Start_Menu_1:: - dbw CH7, SFX_Start_Menu_1_Ch1 + audio_header SFX_Start_Menu_1, Ch8 SFX_Press_AB_1:: - dbw CH4, SFX_Press_AB_1_Ch1 + audio_header SFX_Press_AB_1, Ch5 SFX_Pokedex_Rating_1:: - dbw ( $80 | CH4 ), SFX_Pokedex_Rating_1_Ch1 - dbw CH5, SFX_Pokedex_Rating_1_Ch2 - dbw CH6, SFX_Pokedex_Rating_1_Ch3 + audio_header SFX_Pokedex_Rating_1, Ch5, Ch6, Ch7 SFX_Get_Key_Item_1:: - dbw ( $80 | CH4 ), SFX_Get_Key_Item_1_Ch1 - dbw CH5, SFX_Get_Key_Item_1_Ch2 - dbw CH6, SFX_Get_Key_Item_1_Ch3 + audio_header SFX_Get_Key_Item_1, Ch5, Ch6, Ch7 SFX_Poisoned_1:: - dbw CH4, SFX_Poisoned_1_Ch1 + audio_header SFX_Poisoned_1, Ch5 SFX_Trade_Machine_1:: - dbw CH4, SFX_Trade_Machine_1_Ch1 + audio_header SFX_Trade_Machine_1, Ch5 SFX_Turn_On_PC_1:: - dbw CH4, SFX_Turn_On_PC_1_Ch1 + audio_header SFX_Turn_On_PC_1, Ch5 SFX_Turn_Off_PC_1:: - dbw CH4, SFX_Turn_Off_PC_1_Ch1 + audio_header SFX_Turn_Off_PC_1, Ch5 SFX_Enter_PC_1:: - dbw CH4, SFX_Enter_PC_1_Ch1 + audio_header SFX_Enter_PC_1, Ch5 SFX_Shrink_1:: - dbw CH4, SFX_Shrink_1_Ch1 + audio_header SFX_Shrink_1, Ch5 SFX_Switch_1:: - dbw CH4, SFX_Switch_1_Ch1 + audio_header SFX_Switch_1, Ch5 SFX_Healing_Machine_1:: - dbw CH4, SFX_Healing_Machine_1_Ch1 + audio_header SFX_Healing_Machine_1, Ch5 SFX_Teleport_Exit1_1:: - dbw CH4, SFX_Teleport_Exit1_1_Ch1 + audio_header SFX_Teleport_Exit1_1, Ch5 SFX_Teleport_Enter1_1:: - dbw CH4, SFX_Teleport_Enter1_1_Ch1 + audio_header SFX_Teleport_Enter1_1, Ch5 SFX_Teleport_Exit2_1:: - dbw CH4, SFX_Teleport_Exit2_1_Ch1 + audio_header SFX_Teleport_Exit2_1, Ch5 SFX_Ledge_1:: - dbw CH4, SFX_Ledge_1_Ch1 + audio_header SFX_Ledge_1, Ch5 SFX_Teleport_Enter2_1:: - dbw CH7, SFX_Teleport_Enter2_1_Ch1 + audio_header SFX_Teleport_Enter2_1, Ch8 SFX_Fly_1:: - dbw CH7, SFX_Fly_1_Ch1 + audio_header SFX_Fly_1, Ch8 SFX_Denied_1:: - dbw ( $40 | CH4 ), SFX_Denied_1_Ch1 - dbw CH5, SFX_Denied_1_Ch2 + audio_header SFX_Denied_1, Ch5, Ch6 SFX_Arrow_Tiles_1:: - dbw CH4, SFX_Arrow_Tiles_1_Ch1 + audio_header SFX_Arrow_Tiles_1, Ch5 SFX_Push_Boulder_1:: - dbw CH7, SFX_Push_Boulder_1_Ch1 + audio_header SFX_Push_Boulder_1, Ch8 SFX_SS_Anne_Horn_1:: - dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_1_Ch1 - dbw CH5, SFX_SS_Anne_Horn_1_Ch2 + audio_header SFX_SS_Anne_Horn_1, Ch5, Ch6 SFX_Withdraw_Deposit_1:: - dbw CH4, SFX_Withdraw_Deposit_1_Ch1 + audio_header SFX_Withdraw_Deposit_1, Ch5 SFX_Cut_1:: - dbw CH7, SFX_Cut_1_Ch1 + audio_header SFX_Cut_1, Ch8 SFX_Go_Inside_1:: - dbw CH7, SFX_Go_Inside_1_Ch1 + audio_header SFX_Go_Inside_1, Ch8 SFX_Swap_1:: - dbw ( $40 | CH4 ), SFX_Swap_1_Ch1 - dbw CH5, SFX_Swap_1_Ch2 + audio_header SFX_Swap_1, Ch5, Ch6 SFX_59_1:: - dbw ( $40 | CH4 ), SFX_59_1_Ch1 - dbw CH5, SFX_59_1_Ch2 + audio_header SFX_59_1, Ch5, Ch6 SFX_Purchase_1:: - dbw ( $40 | CH4 ), SFX_Purchase_1_Ch1 - dbw CH5, SFX_Purchase_1_Ch2 + audio_header SFX_Purchase_1, Ch5, Ch6 SFX_Collision_1:: - dbw CH4, SFX_Collision_1_Ch1 + audio_header SFX_Collision_1, Ch5 SFX_Go_Outside_1:: - dbw CH7, SFX_Go_Outside_1_Ch1 + audio_header SFX_Go_Outside_1, Ch8 SFX_Save_1:: - dbw ( $40 | CH4 ), SFX_Save_1_Ch1 - dbw CH5, SFX_Save_1_Ch2 + audio_header SFX_Save_1, Ch5, Ch6 +; the Pokeflute sound effect directly hijacks channel 3 SFX_Pokeflute:: - dbw CH2, SFX_Pokeflute_Ch1 + audio_header SFX_Pokeflute, Ch3 SFX_Safari_Zone_PA:: - dbw CH4, SFX_Safari_Zone_PA_Ch1 + audio_header SFX_Safari_Zone_PA, Ch5 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 2f517d10..eb8eb4c1 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,473 +1,359 @@ SFX_Headers_2:: dbw -1, -1 ; padding -SFX_Snare1_2:: - dbw CH7, SFX_Snare1_2_Ch1 +SFX_Noise_Instrument01_2:: + audio_header SFX_Noise_Instrument01_2, Ch8 -SFX_Snare2_2:: - dbw CH7, SFX_Snare2_2_Ch1 +SFX_Noise_Instrument02_2:: + audio_header SFX_Noise_Instrument02_2, Ch8 -SFX_Snare3_2:: - dbw CH7, SFX_Snare3_2_Ch1 +SFX_Noise_Instrument03_2:: + audio_header SFX_Noise_Instrument03_2, Ch8 -SFX_Snare4_2:: - dbw CH7, SFX_Snare4_2_Ch1 +SFX_Noise_Instrument04_2:: + audio_header SFX_Noise_Instrument04_2, Ch8 -SFX_Snare5_2:: - dbw CH7, SFX_Snare5_2_Ch1 +SFX_Noise_Instrument05_2:: + audio_header SFX_Noise_Instrument05_2, Ch8 -SFX_Triangle1_2:: - dbw CH7, SFX_Triangle1_2_Ch1 +SFX_Noise_Instrument06_2:: + audio_header SFX_Noise_Instrument06_2, Ch8 -SFX_Triangle2_2:: - dbw CH7, SFX_Triangle2_2_Ch1 +SFX_Noise_Instrument07_2:: + audio_header SFX_Noise_Instrument07_2, Ch8 -SFX_Snare6_2:: - dbw CH7, SFX_Snare6_2_Ch1 +SFX_Noise_Instrument08_2:: + audio_header SFX_Noise_Instrument08_2, Ch8 -SFX_Snare7_2:: - dbw CH7, SFX_Snare7_2_Ch1 +SFX_Noise_Instrument09_2:: + audio_header SFX_Noise_Instrument09_2, Ch8 -SFX_Snare8_2:: - dbw CH7, SFX_Snare8_2_Ch1 +SFX_Noise_Instrument10_2:: + audio_header SFX_Noise_Instrument10_2, Ch8 -SFX_Snare9_2:: - dbw CH7, SFX_Snare9_2_Ch1 +SFX_Noise_Instrument11_2:: + audio_header SFX_Noise_Instrument11_2, Ch8 -SFX_Cymbal1_2:: - dbw CH7, SFX_Cymbal1_2_Ch1 +SFX_Noise_Instrument12_2:: + audio_header SFX_Noise_Instrument12_2, Ch8 -SFX_Cymbal2_2:: - dbw CH7, SFX_Cymbal2_2_Ch1 +SFX_Noise_Instrument13_2:: + audio_header SFX_Noise_Instrument13_2, Ch8 -SFX_Cymbal3_2:: - dbw CH7, SFX_Cymbal3_2_Ch1 +SFX_Noise_Instrument14_2:: + audio_header SFX_Noise_Instrument14_2, Ch8 -SFX_Muted_Snare1_2:: - dbw CH7, SFX_Muted_Snare1_2_Ch1 +SFX_Noise_Instrument15_2:: + audio_header SFX_Noise_Instrument15_2, Ch8 -SFX_Triangle3_2:: - dbw CH7, SFX_Triangle3_2_Ch1 +SFX_Noise_Instrument16_2:: + audio_header SFX_Noise_Instrument16_2, Ch8 -SFX_Muted_Snare2_2:: - dbw CH7, SFX_Muted_Snare2_2_Ch1 +SFX_Noise_Instrument17_2:: + audio_header SFX_Noise_Instrument17_2, Ch8 -SFX_Muted_Snare3_2:: - dbw CH7, SFX_Muted_Snare3_2_Ch1 +SFX_Noise_Instrument18_2:: + audio_header SFX_Noise_Instrument18_2, Ch8 -SFX_Muted_Snare4_2:: - dbw CH7, SFX_Muted_Snare4_2_Ch1 +SFX_Noise_Instrument19_2:: + audio_header SFX_Noise_Instrument19_2, Ch8 SFX_Cry00_2:: - dbw ( $80 | CH4 ), SFX_Cry00_2_Ch1 - dbw CH5, SFX_Cry00_2_Ch2 - dbw CH7, SFX_Cry00_2_Ch3 + audio_header SFX_Cry00_2, Ch5, Ch6, Ch8 SFX_Cry01_2:: - dbw ( $80 | CH4 ), SFX_Cry01_2_Ch1 - dbw CH5, SFX_Cry01_2_Ch2 - dbw CH7, SFX_Cry01_2_Ch3 + audio_header SFX_Cry01_2, Ch5, Ch6, Ch8 SFX_Cry02_2:: - dbw ( $80 | CH4 ), SFX_Cry02_2_Ch1 - dbw CH5, SFX_Cry02_2_Ch2 - dbw CH7, SFX_Cry02_2_Ch3 + audio_header SFX_Cry02_2, Ch5, Ch6, Ch8 SFX_Cry03_2:: - dbw ( $80 | CH4 ), SFX_Cry03_2_Ch1 - dbw CH5, SFX_Cry03_2_Ch2 - dbw CH7, SFX_Cry03_2_Ch3 + audio_header SFX_Cry03_2, Ch5, Ch6, Ch8 SFX_Cry04_2:: - dbw ( $80 | CH4 ), SFX_Cry04_2_Ch1 - dbw CH5, SFX_Cry04_2_Ch2 - dbw CH7, SFX_Cry04_2_Ch3 + audio_header SFX_Cry04_2, Ch5, Ch6, Ch8 SFX_Cry05_2:: - dbw ( $80 | CH4 ), SFX_Cry05_2_Ch1 - dbw CH5, SFX_Cry05_2_Ch2 - dbw CH7, SFX_Cry05_2_Ch3 + audio_header SFX_Cry05_2, Ch5, Ch6, Ch8 SFX_Cry06_2:: - dbw ( $80 | CH4 ), SFX_Cry06_2_Ch1 - dbw CH5, SFX_Cry06_2_Ch2 - dbw CH7, SFX_Cry06_2_Ch3 + audio_header SFX_Cry06_2, Ch5, Ch6, Ch8 SFX_Cry07_2:: - dbw ( $80 | CH4 ), SFX_Cry07_2_Ch1 - dbw CH5, SFX_Cry07_2_Ch2 - dbw CH7, SFX_Cry07_2_Ch3 + audio_header SFX_Cry07_2, Ch5, Ch6, Ch8 SFX_Cry08_2:: - dbw ( $80 | CH4 ), SFX_Cry08_2_Ch1 - dbw CH5, SFX_Cry08_2_Ch2 - dbw CH7, SFX_Cry08_2_Ch3 + audio_header SFX_Cry08_2, Ch5, Ch6, Ch8 SFX_Cry09_2:: - dbw ( $80 | CH4 ), SFX_Cry09_2_Ch1 - dbw CH5, SFX_Cry09_2_Ch2 - dbw CH7, SFX_Cry09_2_Ch3 + audio_header SFX_Cry09_2, Ch5, Ch6, Ch8 SFX_Cry0A_2:: - dbw ( $80 | CH4 ), SFX_Cry0A_2_Ch1 - dbw CH5, SFX_Cry0A_2_Ch2 - dbw CH7, SFX_Cry0A_2_Ch3 + audio_header SFX_Cry0A_2, Ch5, Ch6, Ch8 SFX_Cry0B_2:: - dbw ( $80 | CH4 ), SFX_Cry0B_2_Ch1 - dbw CH5, SFX_Cry0B_2_Ch2 - dbw CH7, SFX_Cry0B_2_Ch3 + audio_header SFX_Cry0B_2, Ch5, Ch6, Ch8 SFX_Cry0C_2:: - dbw ( $80 | CH4 ), SFX_Cry0C_2_Ch1 - dbw CH5, SFX_Cry0C_2_Ch2 - dbw CH7, SFX_Cry0C_2_Ch3 + audio_header SFX_Cry0C_2, Ch5, Ch6, Ch8 SFX_Cry0D_2:: - dbw ( $80 | CH4 ), SFX_Cry0D_2_Ch1 - dbw CH5, SFX_Cry0D_2_Ch2 - dbw CH7, SFX_Cry0D_2_Ch3 + audio_header SFX_Cry0D_2, Ch5, Ch6, Ch8 SFX_Cry0E_2:: - dbw ( $80 | CH4 ), SFX_Cry0E_2_Ch1 - dbw CH5, SFX_Cry0E_2_Ch2 - dbw CH7, SFX_Cry0E_2_Ch3 + audio_header SFX_Cry0E_2, Ch5, Ch6, Ch8 SFX_Cry0F_2:: - dbw ( $80 | CH4 ), SFX_Cry0F_2_Ch1 - dbw CH5, SFX_Cry0F_2_Ch2 - dbw CH7, SFX_Cry0F_2_Ch3 + audio_header SFX_Cry0F_2, Ch5, Ch6, Ch8 SFX_Cry10_2:: - dbw ( $80 | CH4 ), SFX_Cry10_2_Ch1 - dbw CH5, SFX_Cry10_2_Ch2 - dbw CH7, SFX_Cry10_2_Ch3 + audio_header SFX_Cry10_2, Ch5, Ch6, Ch8 SFX_Cry11_2:: - dbw ( $80 | CH4 ), SFX_Cry11_2_Ch1 - dbw CH5, SFX_Cry11_2_Ch2 - dbw CH7, SFX_Cry11_2_Ch3 + audio_header SFX_Cry11_2, Ch5, Ch6, Ch8 SFX_Cry12_2:: - dbw ( $80 | CH4 ), SFX_Cry12_2_Ch1 - dbw CH5, SFX_Cry12_2_Ch2 - dbw CH7, SFX_Cry12_2_Ch3 + audio_header SFX_Cry12_2, Ch5, Ch6, Ch8 SFX_Cry13_2:: - dbw ( $80 | CH4 ), SFX_Cry13_2_Ch1 - dbw CH5, SFX_Cry13_2_Ch2 - dbw CH7, SFX_Cry13_2_Ch3 + audio_header SFX_Cry13_2, Ch5, Ch6, Ch8 SFX_Cry14_2:: - dbw ( $80 | CH4 ), SFX_Cry14_2_Ch1 - dbw CH5, SFX_Cry14_2_Ch2 - dbw CH7, SFX_Cry14_2_Ch3 + audio_header SFX_Cry14_2, Ch5, Ch6, Ch8 SFX_Cry15_2:: - dbw ( $80 | CH4 ), SFX_Cry15_2_Ch1 - dbw CH5, SFX_Cry15_2_Ch2 - dbw CH7, SFX_Cry15_2_Ch3 + audio_header SFX_Cry15_2, Ch5, Ch6, Ch8 SFX_Cry16_2:: - dbw ( $80 | CH4 ), SFX_Cry16_2_Ch1 - dbw CH5, SFX_Cry16_2_Ch2 - dbw CH7, SFX_Cry16_2_Ch3 + audio_header SFX_Cry16_2, Ch5, Ch6, Ch8 SFX_Cry17_2:: - dbw ( $80 | CH4 ), SFX_Cry17_2_Ch1 - dbw CH5, SFX_Cry17_2_Ch2 - dbw CH7, SFX_Cry17_2_Ch3 + audio_header SFX_Cry17_2, Ch5, Ch6, Ch8 SFX_Cry18_2:: - dbw ( $80 | CH4 ), SFX_Cry18_2_Ch1 - dbw CH5, SFX_Cry18_2_Ch2 - dbw CH7, SFX_Cry18_2_Ch3 + audio_header SFX_Cry18_2, Ch5, Ch6, Ch8 SFX_Cry19_2:: - dbw ( $80 | CH4 ), SFX_Cry19_2_Ch1 - dbw CH5, SFX_Cry19_2_Ch2 - dbw CH7, SFX_Cry19_2_Ch3 + audio_header SFX_Cry19_2, Ch5, Ch6, Ch8 SFX_Cry1A_2:: - dbw ( $80 | CH4 ), SFX_Cry1A_2_Ch1 - dbw CH5, SFX_Cry1A_2_Ch2 - dbw CH7, SFX_Cry1A_2_Ch3 + audio_header SFX_Cry1A_2, Ch5, Ch6, Ch8 SFX_Cry1B_2:: - dbw ( $80 | CH4 ), SFX_Cry1B_2_Ch1 - dbw CH5, SFX_Cry1B_2_Ch2 - dbw CH7, SFX_Cry1B_2_Ch3 + audio_header SFX_Cry1B_2, Ch5, Ch6, Ch8 SFX_Cry1C_2:: - dbw ( $80 | CH4 ), SFX_Cry1C_2_Ch1 - dbw CH5, SFX_Cry1C_2_Ch2 - dbw CH7, SFX_Cry1C_2_Ch3 + audio_header SFX_Cry1C_2, Ch5, Ch6, Ch8 SFX_Cry1D_2:: - dbw ( $80 | CH4 ), SFX_Cry1D_2_Ch1 - dbw CH5, SFX_Cry1D_2_Ch2 - dbw CH7, SFX_Cry1D_2_Ch3 + audio_header SFX_Cry1D_2, Ch5, Ch6, Ch8 SFX_Cry1E_2:: - dbw ( $80 | CH4 ), SFX_Cry1E_2_Ch1 - dbw CH5, SFX_Cry1E_2_Ch2 - dbw CH7, SFX_Cry1E_2_Ch3 + audio_header SFX_Cry1E_2, Ch5, Ch6, Ch8 SFX_Cry1F_2:: - dbw ( $80 | CH4 ), SFX_Cry1F_2_Ch1 - dbw CH5, SFX_Cry1F_2_Ch2 - dbw CH7, SFX_Cry1F_2_Ch3 + audio_header SFX_Cry1F_2, Ch5, Ch6, Ch8 SFX_Cry20_2:: - dbw ( $80 | CH4 ), SFX_Cry20_2_Ch1 - dbw CH5, SFX_Cry20_2_Ch2 - dbw CH7, SFX_Cry20_2_Ch3 + audio_header SFX_Cry20_2, Ch5, Ch6, Ch8 SFX_Cry21_2:: - dbw ( $80 | CH4 ), SFX_Cry21_2_Ch1 - dbw CH5, SFX_Cry21_2_Ch2 - dbw CH7, SFX_Cry21_2_Ch3 + audio_header SFX_Cry21_2, Ch5, Ch6, Ch8 SFX_Cry22_2:: - dbw ( $80 | CH4 ), SFX_Cry22_2_Ch1 - dbw CH5, SFX_Cry22_2_Ch2 - dbw CH7, SFX_Cry22_2_Ch3 + audio_header SFX_Cry22_2, Ch5, Ch6, Ch8 SFX_Cry23_2:: - dbw ( $80 | CH4 ), SFX_Cry23_2_Ch1 - dbw CH5, SFX_Cry23_2_Ch2 - dbw CH7, SFX_Cry23_2_Ch3 + audio_header SFX_Cry23_2, Ch5, Ch6, Ch8 SFX_Cry24_2:: - dbw ( $80 | CH4 ), SFX_Cry24_2_Ch1 - dbw CH5, SFX_Cry24_2_Ch2 - dbw CH7, SFX_Cry24_2_Ch3 + audio_header SFX_Cry24_2, Ch5, Ch6, Ch8 SFX_Cry25_2:: - dbw ( $80 | CH4 ), SFX_Cry25_2_Ch1 - dbw CH5, SFX_Cry25_2_Ch2 - dbw CH7, SFX_Cry25_2_Ch3 + audio_header SFX_Cry25_2, Ch5, Ch6, Ch8 SFX_Level_Up:: - dbw ( $80 | CH4 ), SFX_Level_Up_Ch1 - dbw CH5, SFX_Level_Up_Ch2 - dbw CH6, SFX_Level_Up_Ch3 + audio_header SFX_Level_Up, Ch5, Ch6, Ch7 SFX_Get_Item2_2:: - dbw ( $80 | CH4 ), SFX_Get_Item2_2_Ch1 - dbw CH5, SFX_Get_Item2_2_Ch2 - dbw CH6, SFX_Get_Item2_2_Ch3 + audio_header SFX_Get_Item2_2, Ch5, Ch6, Ch7 SFX_Tink_2:: - dbw CH4, SFX_Tink_2_Ch1 + audio_header SFX_Tink_2, Ch5 SFX_Heal_HP_2:: - dbw CH4, SFX_Heal_HP_2_Ch1 + audio_header SFX_Heal_HP_2, Ch5 SFX_Heal_Ailment_2:: - dbw CH4, SFX_Heal_Ailment_2_Ch1 + audio_header SFX_Heal_Ailment_2, Ch5 SFX_Start_Menu_2:: - dbw CH7, SFX_Start_Menu_2_Ch1 + audio_header SFX_Start_Menu_2, Ch8 SFX_Press_AB_2:: - dbw CH4, SFX_Press_AB_2_Ch1 + audio_header SFX_Press_AB_2, Ch5 SFX_Ball_Toss:: - dbw ( $40 | CH4 ), SFX_Ball_Toss_Ch1 - dbw CH5, SFX_Ball_Toss_Ch2 + audio_header SFX_Ball_Toss, Ch5, Ch6 SFX_Ball_Poof:: - dbw ( $40 | CH4 ), SFX_Ball_Poof_Ch1 - dbw CH7, SFX_Ball_Poof_Ch2 + audio_header SFX_Ball_Poof, Ch5, Ch8 SFX_Faint_Thud:: - dbw ( $40 | CH4 ), SFX_Faint_Thud_Ch1 - dbw CH7, SFX_Faint_Thud_Ch2 + audio_header SFX_Faint_Thud, Ch5, Ch8 SFX_Run:: - dbw CH7, SFX_Run_Ch1 + audio_header SFX_Run, Ch8 SFX_Dex_Page_Added:: - dbw ( $40 | CH4 ), SFX_Dex_Page_Added_Ch1 - dbw CH5, SFX_Dex_Page_Added_Ch2 + audio_header SFX_Dex_Page_Added, Ch5, Ch6 SFX_Caught_Mon:: - dbw ( $80 | CH4 ), SFX_Caught_Mon_Ch1 - dbw CH5, SFX_Caught_Mon_Ch2 - dbw CH6, SFX_Caught_Mon_Ch3 + audio_header SFX_Caught_Mon, Ch5, Ch6, Ch7 SFX_Peck:: - dbw CH7, SFX_Peck_Ch1 + audio_header SFX_Peck, Ch8 SFX_Faint_Fall:: - dbw CH4, SFX_Faint_Fall_Ch1 + audio_header SFX_Faint_Fall, Ch5 SFX_Battle_09:: - dbw CH4, SFX_Battle_09_Ch1 + audio_header SFX_Battle_09, Ch5 SFX_Pound:: - dbw CH7, SFX_Pound_Ch1 + audio_header SFX_Pound, Ch8 SFX_Battle_0B:: - dbw CH7, SFX_Battle_0B_Ch1 + audio_header SFX_Battle_0B, Ch8 SFX_Battle_0C:: - dbw CH7, SFX_Battle_0C_Ch1 + audio_header SFX_Battle_0C, Ch8 SFX_Battle_0D:: - dbw CH7, SFX_Battle_0D_Ch1 + audio_header SFX_Battle_0D, Ch8 SFX_Battle_0E:: - dbw CH7, SFX_Battle_0E_Ch1 + audio_header SFX_Battle_0E, Ch8 SFX_Battle_0F:: - dbw CH7, SFX_Battle_0F_Ch1 + audio_header SFX_Battle_0F, Ch8 SFX_Damage:: - dbw CH7, SFX_Damage_Ch1 + audio_header SFX_Damage, Ch8 SFX_Not_Very_Effective:: - dbw CH7, SFX_Not_Very_Effective_Ch1 + audio_header SFX_Not_Very_Effective, Ch8 SFX_Battle_12:: - dbw CH7, SFX_Battle_12_Ch1 + audio_header SFX_Battle_12, Ch8 SFX_Battle_13:: - dbw CH7, SFX_Battle_13_Ch1 + audio_header SFX_Battle_13, Ch8 SFX_Battle_14:: - dbw CH7, SFX_Battle_14_Ch1 + audio_header SFX_Battle_14, Ch8 SFX_Vine_Whip:: - dbw CH7, SFX_Vine_Whip_Ch1 + audio_header SFX_Vine_Whip, Ch8 SFX_Battle_16:: - dbw CH7, SFX_Battle_16_Ch1 + audio_header SFX_Battle_16, Ch8 SFX_Battle_17:: - dbw CH7, SFX_Battle_17_Ch1 + audio_header SFX_Battle_17, Ch8 SFX_Battle_18:: - dbw CH7, SFX_Battle_18_Ch1 + audio_header SFX_Battle_18, Ch8 SFX_Battle_19:: - dbw CH7, SFX_Battle_19_Ch1 + audio_header SFX_Battle_19, Ch8 SFX_Super_Effective:: - dbw CH7, SFX_Super_Effective_Ch1 + audio_header SFX_Super_Effective, Ch8 SFX_Battle_1B:: - dbw CH7, SFX_Battle_1B_Ch1 + audio_header SFX_Battle_1B, Ch8 SFX_Battle_1C:: - dbw CH7, SFX_Battle_1C_Ch1 + audio_header SFX_Battle_1C, Ch8 SFX_Doubleslap:: - dbw CH7, SFX_Doubleslap_Ch1 + audio_header SFX_Doubleslap, Ch8 SFX_Battle_1E:: - dbw ( $40 | CH4 ), SFX_Battle_1E_Ch1 - dbw CH7, SFX_Battle_1E_Ch2 + audio_header SFX_Battle_1E, Ch5, Ch8 SFX_Horn_Drill:: - dbw CH7, SFX_Horn_Drill_Ch1 + audio_header SFX_Horn_Drill, Ch8 SFX_Battle_20:: - dbw CH7, SFX_Battle_20_Ch1 + audio_header SFX_Battle_20, Ch8 SFX_Battle_21:: - dbw CH7, SFX_Battle_21_Ch1 + audio_header SFX_Battle_21, Ch8 SFX_Battle_22:: - dbw CH7, SFX_Battle_22_Ch1 + audio_header SFX_Battle_22, Ch8 SFX_Battle_23:: - dbw CH7, SFX_Battle_23_Ch1 + audio_header SFX_Battle_23, Ch8 SFX_Battle_24:: - dbw ( $40 | CH4 ), SFX_Battle_24_Ch1 - dbw CH7, SFX_Battle_24_Ch2 + audio_header SFX_Battle_24, Ch5, Ch8 SFX_Battle_25:: - dbw CH7, SFX_Battle_25_Ch1 + audio_header SFX_Battle_25, Ch8 SFX_Battle_26:: - dbw CH7, SFX_Battle_26_Ch1 + audio_header SFX_Battle_26, Ch8 SFX_Battle_27:: - dbw ( $80 | CH4 ), SFX_Battle_27_Ch1 - dbw CH5, SFX_Battle_27_Ch2 - dbw CH7, SFX_Battle_27_Ch3 + audio_header SFX_Battle_27, Ch5, Ch6, Ch8 SFX_Battle_28:: - dbw ( $80 | CH4 ), SFX_Battle_28_Ch1 - dbw CH5, SFX_Battle_28_Ch2 - dbw CH7, SFX_Battle_28_Ch3 + audio_header SFX_Battle_28, Ch5, Ch6, Ch8 -SFX_Earthquake:: - dbw ( $40 | CH4 ), SFX_Earthquake_Ch1 - dbw CH7, SFX_Earthquake_Ch2 +SFX_Battle_29:: + audio_header SFX_Battle_29, Ch5, Ch8 SFX_Battle_2A:: - dbw ( $80 | CH4 ), SFX_Battle_2A_Ch1 - dbw CH5, SFX_Battle_2A_Ch2 - dbw CH7, SFX_Battle_2A_Ch3 + audio_header SFX_Battle_2A, Ch5, Ch6, Ch8 SFX_Battle_2B:: - dbw ( $40 | CH4 ), SFX_Battle_2B_Ch1 - dbw CH7, SFX_Battle_2B_Ch2 + audio_header SFX_Battle_2B, Ch5, Ch8 SFX_Battle_2C:: - dbw ( $80 | CH4 ), SFX_Battle_2C_Ch1 - dbw CH5, SFX_Battle_2C_Ch2 - dbw CH7, SFX_Battle_2C_Ch3 + audio_header SFX_Battle_2C, Ch5, Ch6, Ch8 SFX_Psybeam:: - dbw ( $80 | CH4 ), SFX_Psybeam_Ch1 - dbw CH5, SFX_Psybeam_Ch2 - dbw CH7, SFX_Psybeam_Ch3 + audio_header SFX_Psybeam, Ch5, Ch6, Ch8 SFX_Battle_2E:: - dbw ( $80 | CH4 ), SFX_Battle_2E_Ch1 - dbw CH5, SFX_Battle_2E_Ch2 - dbw CH7, SFX_Battle_2E_Ch3 + audio_header SFX_Battle_2E, Ch5, Ch6, Ch8 -SFX_Thunderbolt:: - dbw ( $80 | CH4 ), SFX_Thunderbolt_Ch1 - dbw CH5, SFX_Thunderbolt_Ch2 - dbw CH7, SFX_Thunderbolt_Ch3 +SFX_Battle_2F:: + audio_header SFX_Battle_2F, Ch5, Ch6, Ch8 SFX_Psychic_M:: - dbw ( $80 | CH4 ), SFX_Psychic_M_Ch1 - dbw CH5, SFX_Psychic_M_Ch2 - dbw CH7, SFX_Psychic_M_Ch3 + audio_header SFX_Psychic_M, Ch5, Ch6, Ch8 SFX_Battle_31:: - dbw ( $40 | CH4 ), SFX_Battle_31_Ch1 - dbw CH5, SFX_Battle_31_Ch2 + audio_header SFX_Battle_31, Ch5, Ch6 SFX_Battle_32:: - dbw ( $40 | CH4 ), SFX_Battle_32_Ch1 - dbw CH5, SFX_Battle_32_Ch2 + audio_header SFX_Battle_32, Ch5, Ch6 SFX_Battle_33:: - dbw ( $40 | CH4 ), SFX_Battle_33_Ch1 - dbw CH5, SFX_Battle_33_Ch2 + audio_header SFX_Battle_33, Ch5, Ch6 SFX_Battle_34:: - dbw ( $80 | CH4 ), SFX_Battle_34_Ch1 - dbw CH5, SFX_Battle_34_Ch2 - dbw CH7, SFX_Battle_34_Ch3 + audio_header SFX_Battle_34, Ch5, Ch6, Ch8 SFX_Battle_35:: - dbw ( $40 | CH4 ), SFX_Battle_35_Ch1 - dbw CH5, SFX_Battle_35_Ch2 + audio_header SFX_Battle_35, Ch5, Ch6 SFX_Battle_36:: - dbw ( $80 | CH4 ), SFX_Battle_36_Ch1 - dbw CH5, SFX_Battle_36_Ch2 - dbw CH7, SFX_Battle_36_Ch3 + audio_header SFX_Battle_36, Ch5, Ch6, Ch8 SFX_Silph_Scope:: - dbw CH4, SFX_Silph_Scope_Ch1 + audio_header SFX_Silph_Scope, Ch5 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index cd940357..d1e0a127 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,402 +1,311 @@ SFX_Headers_3:: dbw -1, -1 ; padding -SFX_Snare1_3:: - dbw CH7, SFX_Snare1_3_Ch1 +SFX_Noise_Instrument01_3:: + audio_header SFX_Noise_Instrument01_3, Ch8 -SFX_Snare2_3:: - dbw CH7, SFX_Snare2_3_Ch1 +SFX_Noise_Instrument02_3:: + audio_header SFX_Noise_Instrument02_3, Ch8 -SFX_Snare3_3:: - dbw CH7, SFX_Snare3_3_Ch1 +SFX_Noise_Instrument03_3:: + audio_header SFX_Noise_Instrument03_3, Ch8 -SFX_Snare4_3:: - dbw CH7, SFX_Snare4_3_Ch1 +SFX_Noise_Instrument04_3:: + audio_header SFX_Noise_Instrument04_3, Ch8 -SFX_Snare5_3:: - dbw CH7, SFX_Snare5_3_Ch1 +SFX_Noise_Instrument05_3:: + audio_header SFX_Noise_Instrument05_3, Ch8 -SFX_Triangle1_3:: - dbw CH7, SFX_Triangle1_3_Ch1 +SFX_Noise_Instrument06_3:: + audio_header SFX_Noise_Instrument06_3, Ch8 -SFX_Triangle2_3:: - dbw CH7, SFX_Triangle2_3_Ch1 +SFX_Noise_Instrument07_3:: + audio_header SFX_Noise_Instrument07_3, Ch8 -SFX_Snare6_3:: - dbw CH7, SFX_Snare6_3_Ch1 +SFX_Noise_Instrument08_3:: + audio_header SFX_Noise_Instrument08_3, Ch8 -SFX_Snare7_3:: - dbw CH7, SFX_Snare7_3_Ch1 +SFX_Noise_Instrument09_3:: + audio_header SFX_Noise_Instrument09_3, Ch8 -SFX_Snare8_3:: - dbw CH7, SFX_Snare8_3_Ch1 +SFX_Noise_Instrument10_3:: + audio_header SFX_Noise_Instrument10_3, Ch8 -SFX_Snare9_3:: - dbw CH7, SFX_Snare9_3_Ch1 +SFX_Noise_Instrument11_3:: + audio_header SFX_Noise_Instrument11_3, Ch8 -SFX_Cymbal1_3:: - dbw CH7, SFX_Cymbal1_3_Ch1 +SFX_Noise_Instrument12_3:: + audio_header SFX_Noise_Instrument12_3, Ch8 -SFX_Cymbal2_3:: - dbw CH7, SFX_Cymbal2_3_Ch1 +SFX_Noise_Instrument13_3:: + audio_header SFX_Noise_Instrument13_3, Ch8 -SFX_Cymbal3_3:: - dbw CH7, SFX_Cymbal3_3_Ch1 +SFX_Noise_Instrument14_3:: + audio_header SFX_Noise_Instrument14_3, Ch8 -SFX_Muted_Snare1_3:: - dbw CH7, SFX_Muted_Snare1_3_Ch1 +SFX_Noise_Instrument15_3:: + audio_header SFX_Noise_Instrument15_3, Ch8 -SFX_Triangle3_3:: - dbw CH7, SFX_Triangle3_3_Ch1 +SFX_Noise_Instrument16_3:: + audio_header SFX_Noise_Instrument16_3, Ch8 -SFX_Muted_Snare2_3:: - dbw CH7, SFX_Muted_Snare2_3_Ch1 +SFX_Noise_Instrument17_3:: + audio_header SFX_Noise_Instrument17_3, Ch8 -SFX_Muted_Snare3_3:: - dbw CH7, SFX_Muted_Snare3_3_Ch1 +SFX_Noise_Instrument18_3:: + audio_header SFX_Noise_Instrument18_3, Ch8 -SFX_Muted_Snare4_3:: - dbw CH7, SFX_Muted_Snare4_3_Ch1 +SFX_Noise_Instrument19_3:: + audio_header SFX_Noise_Instrument19_3, Ch8 SFX_Cry00_3:: - dbw ( $80 | CH4 ), SFX_Cry00_3_Ch1 - dbw CH5, SFX_Cry00_3_Ch2 - dbw CH7, SFX_Cry00_3_Ch3 + audio_header SFX_Cry00_3, Ch5, Ch6, Ch8 SFX_Cry01_3:: - dbw ( $80 | CH4 ), SFX_Cry01_3_Ch1 - dbw CH5, SFX_Cry01_3_Ch2 - dbw CH7, SFX_Cry01_3_Ch3 + audio_header SFX_Cry01_3, Ch5, Ch6, Ch8 SFX_Cry02_3:: - dbw ( $80 | CH4 ), SFX_Cry02_3_Ch1 - dbw CH5, SFX_Cry02_3_Ch2 - dbw CH7, SFX_Cry02_3_Ch3 + audio_header SFX_Cry02_3, Ch5, Ch6, Ch8 SFX_Cry03_3:: - dbw ( $80 | CH4 ), SFX_Cry03_3_Ch1 - dbw CH5, SFX_Cry03_3_Ch2 - dbw CH7, SFX_Cry03_3_Ch3 + audio_header SFX_Cry03_3, Ch5, Ch6, Ch8 SFX_Cry04_3:: - dbw ( $80 | CH4 ), SFX_Cry04_3_Ch1 - dbw CH5, SFX_Cry04_3_Ch2 - dbw CH7, SFX_Cry04_3_Ch3 + audio_header SFX_Cry04_3, Ch5, Ch6, Ch8 SFX_Cry05_3:: - dbw ( $80 | CH4 ), SFX_Cry05_3_Ch1 - dbw CH5, SFX_Cry05_3_Ch2 - dbw CH7, SFX_Cry05_3_Ch3 + audio_header SFX_Cry05_3, Ch5, Ch6, Ch8 SFX_Cry06_3:: - dbw ( $80 | CH4 ), SFX_Cry06_3_Ch1 - dbw CH5, SFX_Cry06_3_Ch2 - dbw CH7, SFX_Cry06_3_Ch3 + audio_header SFX_Cry06_3, Ch5, Ch6, Ch8 SFX_Cry07_3:: - dbw ( $80 | CH4 ), SFX_Cry07_3_Ch1 - dbw CH5, SFX_Cry07_3_Ch2 - dbw CH7, SFX_Cry07_3_Ch3 + audio_header SFX_Cry07_3, Ch5, Ch6, Ch8 SFX_Cry08_3:: - dbw ( $80 | CH4 ), SFX_Cry08_3_Ch1 - dbw CH5, SFX_Cry08_3_Ch2 - dbw CH7, SFX_Cry08_3_Ch3 + audio_header SFX_Cry08_3, Ch5, Ch6, Ch8 SFX_Cry09_3:: - dbw ( $80 | CH4 ), SFX_Cry09_3_Ch1 - dbw CH5, SFX_Cry09_3_Ch2 - dbw CH7, SFX_Cry09_3_Ch3 + audio_header SFX_Cry09_3, Ch5, Ch6, Ch8 SFX_Cry0A_3:: - dbw ( $80 | CH4 ), SFX_Cry0A_3_Ch1 - dbw CH5, SFX_Cry0A_3_Ch2 - dbw CH7, SFX_Cry0A_3_Ch3 + audio_header SFX_Cry0A_3, Ch5, Ch6, Ch8 SFX_Cry0B_3:: - dbw ( $80 | CH4 ), SFX_Cry0B_3_Ch1 - dbw CH5, SFX_Cry0B_3_Ch2 - dbw CH7, SFX_Cry0B_3_Ch3 + audio_header SFX_Cry0B_3, Ch5, Ch6, Ch8 SFX_Cry0C_3:: - dbw ( $80 | CH4 ), SFX_Cry0C_3_Ch1 - dbw CH5, SFX_Cry0C_3_Ch2 - dbw CH7, SFX_Cry0C_3_Ch3 + audio_header SFX_Cry0C_3, Ch5, Ch6, Ch8 SFX_Cry0D_3:: - dbw ( $80 | CH4 ), SFX_Cry0D_3_Ch1 - dbw CH5, SFX_Cry0D_3_Ch2 - dbw CH7, SFX_Cry0D_3_Ch3 + audio_header SFX_Cry0D_3, Ch5, Ch6, Ch8 SFX_Cry0E_3:: - dbw ( $80 | CH4 ), SFX_Cry0E_3_Ch1 - dbw CH5, SFX_Cry0E_3_Ch2 - dbw CH7, SFX_Cry0E_3_Ch3 + audio_header SFX_Cry0E_3, Ch5, Ch6, Ch8 SFX_Cry0F_3:: - dbw ( $80 | CH4 ), SFX_Cry0F_3_Ch1 - dbw CH5, SFX_Cry0F_3_Ch2 - dbw CH7, SFX_Cry0F_3_Ch3 + audio_header SFX_Cry0F_3, Ch5, Ch6, Ch8 SFX_Cry10_3:: - dbw ( $80 | CH4 ), SFX_Cry10_3_Ch1 - dbw CH5, SFX_Cry10_3_Ch2 - dbw CH7, SFX_Cry10_3_Ch3 + audio_header SFX_Cry10_3, Ch5, Ch6, Ch8 SFX_Cry11_3:: - dbw ( $80 | CH4 ), SFX_Cry11_3_Ch1 - dbw CH5, SFX_Cry11_3_Ch2 - dbw CH7, SFX_Cry11_3_Ch3 + audio_header SFX_Cry11_3, Ch5, Ch6, Ch8 SFX_Cry12_3:: - dbw ( $80 | CH4 ), SFX_Cry12_3_Ch1 - dbw CH5, SFX_Cry12_3_Ch2 - dbw CH7, SFX_Cry12_3_Ch3 + audio_header SFX_Cry12_3, Ch5, Ch6, Ch8 SFX_Cry13_3:: - dbw ( $80 | CH4 ), SFX_Cry13_3_Ch1 - dbw CH5, SFX_Cry13_3_Ch2 - dbw CH7, SFX_Cry13_3_Ch3 + audio_header SFX_Cry13_3, Ch5, Ch6, Ch8 SFX_Cry14_3:: - dbw ( $80 | CH4 ), SFX_Cry14_3_Ch1 - dbw CH5, SFX_Cry14_3_Ch2 - dbw CH7, SFX_Cry14_3_Ch3 + audio_header SFX_Cry14_3, Ch5, Ch6, Ch8 SFX_Cry15_3:: - dbw ( $80 | CH4 ), SFX_Cry15_3_Ch1 - dbw CH5, SFX_Cry15_3_Ch2 - dbw CH7, SFX_Cry15_3_Ch3 + audio_header SFX_Cry15_3, Ch5, Ch6, Ch8 SFX_Cry16_3:: - dbw ( $80 | CH4 ), SFX_Cry16_3_Ch1 - dbw CH5, SFX_Cry16_3_Ch2 - dbw CH7, SFX_Cry16_3_Ch3 + audio_header SFX_Cry16_3, Ch5, Ch6, Ch8 SFX_Cry17_3:: - dbw ( $80 | CH4 ), SFX_Cry17_3_Ch1 - dbw CH5, SFX_Cry17_3_Ch2 - dbw CH7, SFX_Cry17_3_Ch3 + audio_header SFX_Cry17_3, Ch5, Ch6, Ch8 SFX_Cry18_3:: - dbw ( $80 | CH4 ), SFX_Cry18_3_Ch1 - dbw CH5, SFX_Cry18_3_Ch2 - dbw CH7, SFX_Cry18_3_Ch3 + audio_header SFX_Cry18_3, Ch5, Ch6, Ch8 SFX_Cry19_3:: - dbw ( $80 | CH4 ), SFX_Cry19_3_Ch1 - dbw CH5, SFX_Cry19_3_Ch2 - dbw CH7, SFX_Cry19_3_Ch3 + audio_header SFX_Cry19_3, Ch5, Ch6, Ch8 SFX_Cry1A_3:: - dbw ( $80 | CH4 ), SFX_Cry1A_3_Ch1 - dbw CH5, SFX_Cry1A_3_Ch2 - dbw CH7, SFX_Cry1A_3_Ch3 + audio_header SFX_Cry1A_3, Ch5, Ch6, Ch8 SFX_Cry1B_3:: - dbw ( $80 | CH4 ), SFX_Cry1B_3_Ch1 - dbw CH5, SFX_Cry1B_3_Ch2 - dbw CH7, SFX_Cry1B_3_Ch3 + audio_header SFX_Cry1B_3, Ch5, Ch6, Ch8 SFX_Cry1C_3:: - dbw ( $80 | CH4 ), SFX_Cry1C_3_Ch1 - dbw CH5, SFX_Cry1C_3_Ch2 - dbw CH7, SFX_Cry1C_3_Ch3 + audio_header SFX_Cry1C_3, Ch5, Ch6, Ch8 SFX_Cry1D_3:: - dbw ( $80 | CH4 ), SFX_Cry1D_3_Ch1 - dbw CH5, SFX_Cry1D_3_Ch2 - dbw CH7, SFX_Cry1D_3_Ch3 + audio_header SFX_Cry1D_3, Ch5, Ch6, Ch8 SFX_Cry1E_3:: - dbw ( $80 | CH4 ), SFX_Cry1E_3_Ch1 - dbw CH5, SFX_Cry1E_3_Ch2 - dbw CH7, SFX_Cry1E_3_Ch3 + audio_header SFX_Cry1E_3, Ch5, Ch6, Ch8 SFX_Cry1F_3:: - dbw ( $80 | CH4 ), SFX_Cry1F_3_Ch1 - dbw CH5, SFX_Cry1F_3_Ch2 - dbw CH7, SFX_Cry1F_3_Ch3 + audio_header SFX_Cry1F_3, Ch5, Ch6, Ch8 SFX_Cry20_3:: - dbw ( $80 | CH4 ), SFX_Cry20_3_Ch1 - dbw CH5, SFX_Cry20_3_Ch2 - dbw CH7, SFX_Cry20_3_Ch3 + audio_header SFX_Cry20_3, Ch5, Ch6, Ch8 SFX_Cry21_3:: - dbw ( $80 | CH4 ), SFX_Cry21_3_Ch1 - dbw CH5, SFX_Cry21_3_Ch2 - dbw CH7, SFX_Cry21_3_Ch3 + audio_header SFX_Cry21_3, Ch5, Ch6, Ch8 SFX_Cry22_3:: - dbw ( $80 | CH4 ), SFX_Cry22_3_Ch1 - dbw CH5, SFX_Cry22_3_Ch2 - dbw CH7, SFX_Cry22_3_Ch3 + audio_header SFX_Cry22_3, Ch5, Ch6, Ch8 SFX_Cry23_3:: - dbw ( $80 | CH4 ), SFX_Cry23_3_Ch1 - dbw CH5, SFX_Cry23_3_Ch2 - dbw CH7, SFX_Cry23_3_Ch3 + audio_header SFX_Cry23_3, Ch5, Ch6, Ch8 SFX_Cry24_3:: - dbw ( $80 | CH4 ), SFX_Cry24_3_Ch1 - dbw CH5, SFX_Cry24_3_Ch2 - dbw CH7, SFX_Cry24_3_Ch3 + audio_header SFX_Cry24_3, Ch5, Ch6, Ch8 SFX_Cry25_3:: - dbw ( $80 | CH4 ), SFX_Cry25_3_Ch1 - dbw CH5, SFX_Cry25_3_Ch2 - dbw CH7, SFX_Cry25_3_Ch3 + audio_header SFX_Cry25_3, Ch5, Ch6, Ch8 SFX_Get_Item1_3:: - dbw ( $80 | CH4 ), SFX_Get_Item1_3_Ch1 - dbw CH5, SFX_Get_Item1_3_Ch2 - dbw CH6, SFX_Get_Item1_3_Ch3 + audio_header SFX_Get_Item1_3, Ch5, Ch6, Ch7 SFX_Get_Item2_3:: - dbw ( $80 | CH4 ), SFX_Get_Item2_3_Ch1 - dbw CH5, SFX_Get_Item2_3_Ch2 - dbw CH6, SFX_Get_Item2_3_Ch3 + audio_header SFX_Get_Item2_3, Ch5, Ch6, Ch7 SFX_Tink_3:: - dbw CH4, SFX_Tink_3_Ch1 + audio_header SFX_Tink_3, Ch5 SFX_Heal_HP_3:: - dbw CH4, SFX_Heal_HP_3_Ch1 + audio_header SFX_Heal_HP_3, Ch5 SFX_Heal_Ailment_3:: - dbw CH4, SFX_Heal_Ailment_3_Ch1 + audio_header SFX_Heal_Ailment_3, Ch5 SFX_Start_Menu_3:: - dbw CH7, SFX_Start_Menu_3_Ch1 + audio_header SFX_Start_Menu_3, Ch8 SFX_Press_AB_3:: - dbw CH4, SFX_Press_AB_3_Ch1 + audio_header SFX_Press_AB_3, Ch5 SFX_Pokedex_Rating_3:: - dbw ( $80 | CH4 ), SFX_Pokedex_Rating_3_Ch1 - dbw CH5, SFX_Pokedex_Rating_3_Ch2 - dbw CH6, SFX_Pokedex_Rating_3_Ch3 + audio_header SFX_Pokedex_Rating_3, Ch5, Ch6, Ch7 SFX_Get_Key_Item_3:: - dbw ( $80 | CH4 ), SFX_Get_Key_Item_3_Ch1 - dbw CH5, SFX_Get_Key_Item_3_Ch2 - dbw CH6, SFX_Get_Key_Item_3_Ch3 + audio_header SFX_Get_Key_Item_3, Ch5, Ch6, Ch7 SFX_Poisoned_3:: - dbw CH4, SFX_Poisoned_3_Ch1 + audio_header SFX_Poisoned_3, Ch5 SFX_Trade_Machine_3:: - dbw CH4, SFX_Trade_Machine_3_Ch1 + audio_header SFX_Trade_Machine_3, Ch5 SFX_Turn_On_PC_3:: - dbw CH4, SFX_Turn_On_PC_3_Ch1 + audio_header SFX_Turn_On_PC_3, Ch5 SFX_Turn_Off_PC_3:: - dbw CH4, SFX_Turn_Off_PC_3_Ch1 + audio_header SFX_Turn_Off_PC_3, Ch5 SFX_Enter_PC_3:: - dbw CH4, SFX_Enter_PC_3_Ch1 + audio_header SFX_Enter_PC_3, Ch5 SFX_Shrink_3:: - dbw CH4, SFX_Shrink_3_Ch1 + audio_header SFX_Shrink_3, Ch5 SFX_Switch_3:: - dbw CH4, SFX_Switch_3_Ch1 + audio_header SFX_Switch_3, Ch5 SFX_Healing_Machine_3:: - dbw CH4, SFX_Healing_Machine_3_Ch1 + audio_header SFX_Healing_Machine_3, Ch5 SFX_Teleport_Exit1_3:: - dbw CH4, SFX_Teleport_Exit1_3_Ch1 + audio_header SFX_Teleport_Exit1_3, Ch5 SFX_Teleport_Enter1_3:: - dbw CH4, SFX_Teleport_Enter1_3_Ch1 + audio_header SFX_Teleport_Enter1_3, Ch5 SFX_Teleport_Exit2_3:: - dbw CH4, SFX_Teleport_Exit2_3_Ch1 + audio_header SFX_Teleport_Exit2_3, Ch5 SFX_Ledge_3:: - dbw CH4, SFX_Ledge_3_Ch1 + audio_header SFX_Ledge_3, Ch5 SFX_Teleport_Enter2_3:: - dbw CH7, SFX_Teleport_Enter2_3_Ch1 + audio_header SFX_Teleport_Enter2_3, Ch8 SFX_Fly_3:: - dbw CH7, SFX_Fly_3_Ch1 + audio_header SFX_Fly_3, Ch8 SFX_Denied_3:: - dbw ( $40 | CH4 ), SFX_Denied_3_Ch1 - dbw CH5, SFX_Denied_3_Ch2 + audio_header SFX_Denied_3, Ch5, Ch6 SFX_Arrow_Tiles_3:: - dbw CH4, SFX_Arrow_Tiles_3_Ch1 + audio_header SFX_Arrow_Tiles_3, Ch5 SFX_Push_Boulder_3:: - dbw CH7, SFX_Push_Boulder_3_Ch1 + audio_header SFX_Push_Boulder_3, Ch8 SFX_SS_Anne_Horn_3:: - dbw ( $40 | CH4 ), SFX_SS_Anne_Horn_3_Ch1 - dbw CH5, SFX_SS_Anne_Horn_3_Ch2 + audio_header SFX_SS_Anne_Horn_3, Ch5, Ch6 SFX_Withdraw_Deposit_3:: - dbw CH4, SFX_Withdraw_Deposit_3_Ch1 + audio_header SFX_Withdraw_Deposit_3, Ch5 SFX_Cut_3:: - dbw CH7, SFX_Cut_3_Ch1 + audio_header SFX_Cut_3, Ch8 SFX_Go_Inside_3:: - dbw CH7, SFX_Go_Inside_3_Ch1 + audio_header SFX_Go_Inside_3, Ch8 SFX_Swap_3:: - dbw ( $40 | CH4 ), SFX_Swap_3_Ch1 - dbw CH5, SFX_Swap_3_Ch2 + audio_header SFX_Swap_3, Ch5, Ch6 SFX_59_3:: - dbw ( $40 | CH4 ), SFX_59_3_Ch1 - dbw CH5, SFX_59_3_Ch2 + audio_header SFX_59_3, Ch5, Ch6 SFX_Purchase_3:: - dbw ( $40 | CH4 ), SFX_Purchase_3_Ch1 - dbw CH5, SFX_Purchase_3_Ch2 + audio_header SFX_Purchase_3, Ch5, Ch6 SFX_Collision_3:: - dbw CH4, SFX_Collision_3_Ch1 + audio_header SFX_Collision_3, Ch5 SFX_Go_Outside_3:: - dbw CH7, SFX_Go_Outside_3_Ch1 + audio_header SFX_Go_Outside_3, Ch8 SFX_Save_3:: - dbw ( $40 | CH4 ), SFX_Save_3_Ch1 - dbw CH5, SFX_Save_3_Ch2 + audio_header SFX_Save_3, Ch5, Ch6 SFX_Intro_Lunge:: - dbw CH7, SFX_Intro_Lunge_Ch1 + audio_header SFX_Intro_Lunge, Ch8 SFX_Intro_Hip:: - dbw CH4, SFX_Intro_Hip_Ch1 + audio_header SFX_Intro_Hip, Ch5 SFX_Intro_Hop:: - dbw CH4, SFX_Intro_Hop_Ch1 + audio_header SFX_Intro_Hop, Ch5 SFX_Intro_Raise:: - dbw CH7, SFX_Intro_Raise_Ch1 + audio_header SFX_Intro_Raise, Ch8 SFX_Intro_Crash:: - dbw CH7, SFX_Intro_Crash_Ch1 + audio_header SFX_Intro_Crash, Ch8 SFX_Intro_Whoosh:: - dbw CH7, SFX_Intro_Whoosh_Ch1 + audio_header SFX_Intro_Whoosh, Ch8 SFX_Slots_Stop_Wheel:: - dbw CH4, SFX_Slots_Stop_Wheel_Ch1 + audio_header SFX_Slots_Stop_Wheel, Ch5 SFX_Slots_Reward:: - dbw CH4, SFX_Slots_Reward_Ch1 + audio_header SFX_Slots_Reward, Ch5 SFX_Slots_New_Spin:: - dbw ( $40 | CH4 ), SFX_Slots_New_Spin_Ch1 - dbw CH5, SFX_Slots_New_Spin_Ch2 + audio_header SFX_Slots_New_Spin, Ch5, Ch6 SFX_Shooting_Star:: - dbw CH4, SFX_Shooting_Star_Ch1 + audio_header SFX_Shooting_Star, Ch5 diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm index 1fdb69ab..c7f7e9d6 100644 --- a/audio/headers/sfxheaders4.asm +++ b/audio/headers/sfxheaders4.asm @@ -1,294 +1,212 @@ SFX_Headers_4:: dbw -1, -1 ; padding -SFX_Snare1_4:: - dbw CH7, SFX_Snare1_4_Ch7 +SFX_Noise_Instrument01_4:: + audio_header SFX_Noise_Instrument01_4, Ch8 -SFX_Snare2_4:: - dbw CH7, SFX_Snare2_4_Ch7 +SFX_Noise_Instrument02_4:: + audio_header SFX_Noise_Instrument02_4, Ch8 -SFX_Snare3_4:: - dbw CH7, SFX_Snare3_4_Ch7 +SFX_Noise_Instrument03_4:: + audio_header SFX_Noise_Instrument03_4, Ch8 -SFX_Snare4_4:: - dbw CH7, SFX_Snare4_4_Ch7 +SFX_Noise_Instrument04_4:: + audio_header SFX_Noise_Instrument04_4, Ch8 -SFX_Snare5_4:: - dbw CH7, SFX_Snare5_4_Ch7 +SFX_Noise_Instrument05_4:: + audio_header SFX_Noise_Instrument05_4, Ch8 -SFX_Triangle1_4:: - dbw CH7, SFX_Triangle1_4_Ch7 +SFX_Noise_Instrument06_4:: + audio_header SFX_Noise_Instrument06_4, Ch8 -SFX_Triangle2_4:: - dbw CH7, SFX_Triangle2_4_Ch7 +SFX_Noise_Instrument07_4:: + audio_header SFX_Noise_Instrument07_4, Ch8 -SFX_Snare6_4:: - dbw CH7, SFX_Snare6_4_Ch7 +SFX_Noise_Instrument08_4:: + audio_header SFX_Noise_Instrument08_4, Ch8 -SFX_Snare7_4:: - dbw CH7, SFX_Snare7_4_Ch7 +SFX_Noise_Instrument09_4:: + audio_header SFX_Noise_Instrument09_4, Ch8 -SFX_Snare8_4:: - dbw CH7, SFX_Snare8_4_Ch7 +SFX_Noise_Instrument10_4:: + audio_header SFX_Noise_Instrument10_4, Ch8 -SFX_Snare9_4:: - dbw CH7, SFX_Snare9_4_Ch7 +SFX_Noise_Instrument11_4:: + audio_header SFX_Noise_Instrument11_4, Ch8 -SFX_Cymbal1_4:: - dbw CH7, SFX_Cymbal1_4_Ch7 +SFX_Noise_Instrument12_4:: + audio_header SFX_Noise_Instrument12_4, Ch8 -SFX_Cymbal2_4:: - dbw CH7, SFX_Cymbal2_4_Ch7 +SFX_Noise_Instrument13_4:: + audio_header SFX_Noise_Instrument13_4, Ch8 -SFX_Cymbal3_4:: - dbw CH7, SFX_Cymbal3_4_Ch7 +SFX_Noise_Instrument14_4:: + audio_header SFX_Noise_Instrument14_4, Ch8 -SFX_Muted_Snare1_4:: - dbw CH7, SFX_Muted_Snare1_4_Ch7 +SFX_Noise_Instrument15_4:: + audio_header SFX_Noise_Instrument15_4, Ch8 -SFX_Triangle3_4:: - dbw CH7, SFX_Triangle3_4_Ch7 +SFX_Noise_Instrument16_4:: + audio_header SFX_Noise_Instrument16_4, Ch8 -SFX_Muted_Snare2_4:: - dbw CH7, SFX_Muted_Snare2_4_Ch7 +SFX_Noise_Instrument17_4:: + audio_header SFX_Noise_Instrument17_4, Ch8 -SFX_Muted_Snare3_4:: - dbw CH7, SFX_Muted_Snare3_4_Ch7 +SFX_Noise_Instrument18_4:: + audio_header SFX_Noise_Instrument18_4, Ch8 -SFX_Muted_Snare4_4:: - dbw CH7, SFX_Muted_Snare4_4_Ch7 +SFX_Noise_Instrument19_4:: + audio_header SFX_Noise_Instrument19_4, Ch8 -SFX_8003c_4:: - dbw ( $80 | CH4 ), SFX_805db_4_Ch4 - dbw CH5, SFX_805ea_4_Ch5 - dbw CH7, SFX_805f9_4_Ch7 +SFX_Unknown_805db:: + audio_header SFX_Unknown_805db, Ch5, Ch6, Ch8 -SFX_80045_4:: - dbw ( $80 | CH4 ), SFX_807eb_4_Ch4 - dbw CH5, SFX_807fe_4_Ch5 - dbw CH7, SFX_80811_4_Ch7 +SFX_Unknown_807eb:: + audio_header SFX_Unknown_807eb, Ch5, Ch6, Ch8 -SFX_8004e_4:: - dbw ( $80 | CH4 ), SFX_80760_4_Ch4 - dbw CH5, SFX_8076f_4_Ch5 - dbw CH7, SFX_8077d_4_Ch7 - -SFX_80057_4:: - dbw ( $80 | CH4 ), SFX_804fa_4_Ch4 - dbw CH5, SFX_80519_4_Ch5 - dbw CH7, SFX_80538_4_Ch7 - -SFX_80060_4:: - dbw ( $80 | CH4 ), SFX_808a9_4_Ch4 - dbw CH5, SFX_808c8_4_Ch5 - dbw CH7, SFX_808e7_4_Ch7 - -SFX_80069_4:: - dbw ( $80 | CH4 ), SFX_80689_4_Ch4 - dbw CH5, SFX_8069c_4_Ch5 - dbw CH7, SFX_806ae_4_Ch7 - -SFX_80072_4:: - dbw ( $80 | CH4 ), SFX_80633_4_Ch4 - dbw CH5, SFX_8064d_4_Ch5 - dbw CH7, SFX_8064e_4_Ch7 - -SFX_8007b_4:: - dbw ( $80 | CH4 ), SFX_80661_4_Ch4 - dbw CH5, SFX_80670_4_Ch5 - dbw CH7, SFX_8067f_4_Ch7 - -SFX_80084_4:: - dbw ( $80 | CH4 ), SFX_80879_4_Ch4 - dbw CH5, SFX_8088c_4_Ch5 - dbw CH7, SFX_8089f_4_Ch7 - -SFX_8008d_4:: - dbw ( $80 | CH4 ), SFX_80383_4_Ch4 - dbw CH5, SFX_803a0_4_Ch5 - dbw CH7, SFX_803c1_4_Ch7 - -SFX_80096_4:: - dbw ( $80 | CH4 ), SFX_8081e_4_Ch4 - dbw CH5, SFX_8083d_4_Ch5 - dbw CH7, SFX_80860_4_Ch7 - -SFX_8009f_4:: - dbw ( $80 | CH4 ), SFX_806af_4_Ch4 - dbw CH5, SFX_806da_4_Ch5 - dbw CH7, SFX_806f9_4_Ch7 - -SFX_800a8_4:: - dbw ( $80 | CH4 ), SFX_80712_4_Ch4 - dbw CH5, SFX_80739_4_Ch5 - dbw CH7, SFX_8075f_4_Ch7 - -SFX_800b1_4:: - dbw ( $80 | CH4 ), SFX_8077e_4_Ch4 - dbw CH5, SFX_8079d_4_Ch5 - dbw CH7, SFX_807cc_4_Ch7 - -SFX_800ba_4:: - dbw ( $80 | CH4 ), SFX_80603_4_Ch4 - dbw CH5, SFX_80616_4_Ch5 - dbw CH7, SFX_80629_4_Ch7 - -SFX_800c3_4:: - dbw ( $80 | CH4 ), SFX_80545_4_Ch4 - dbw CH5, SFX_80560_4_Ch5 - dbw CH7, SFX_8057b_4_Ch7 - -SFX_800cc_4:: - dbw ( $80 | CH4 ), SFX_8058b_4_Ch4 - dbw CH5, SFX_805ae_4_Ch5 - dbw CH7, SFX_805d1_4_Ch7 - -SFX_800d5_4:: - dbw ( $80 | CH4 ), SFX_80467_4_Ch4 - dbw CH5, SFX_80486_4_Ch5 - dbw CH7, SFX_804a9_4_Ch7 - -SFX_800de_4:: - dbw ( $80 | CH4 ), SFX_8097f_4_Ch4 - dbw CH5, SFX_80992_4_Ch5 - dbw CH7, SFX_809a5_4_Ch7 - -SFX_800e7_4:: - dbw ( $80 | CH4 ), SFX_809b2_4_Ch4 - dbw CH5, SFX_809cd_4_Ch5 - dbw CH7, SFX_809e8_4_Ch7 - -SFX_800f0_4:: - dbw ( $80 | CH4 ), SFX_809fb_4_Ch4 - dbw CH5, SFX_80a0a_4_Ch5 - dbw CH7, SFX_80a19_4_Ch7 - -SFX_800f9_4:: - dbw ( $80 | CH4 ), SFX_80a89_4_Ch4 - dbw CH5, SFX_80aa4_4_Ch5 - dbw CH7, SFX_80abf_4_Ch7 - -SFX_80102_4:: - dbw ( $80 | CH4 ), SFX_8091c_4_Ch4 - dbw CH5, SFX_8092b_4_Ch5 - dbw CH7, SFX_8093a_4_Ch7 - -SFX_8010b_4:: - dbw ( $80 | CH4 ), SFX_80ad2_4_Ch4 - dbw CH5, SFX_80ae5_4_Ch5 - dbw CH7, SFX_80af8_4_Ch7 - -SFX_80114_4:: - dbw ( $80 | CH4 ), SFX_80be2_4_Ch4 - dbw CH5, SFX_80c05_4_Ch5 - dbw CH7, SFX_80c28_4_Ch7 - -SFX_8011d_4:: - dbw ( $80 | CH4 ), SFX_808fa_4_Ch4 - dbw CH5, SFX_80909_4_Ch5 - dbw CH7, SFX_8091b_4_Ch7 - -SFX_80126_4:: - dbw ( $80 | CH4 ), SFX_80b53_4_Ch4 - dbw CH5, SFX_80b6e_4_Ch5 - dbw CH7, SFX_80b89_4_Ch7 - -SFX_8012f_4:: - dbw ( $80 | CH4 ), SFX_80944_4_Ch4 - dbw CH5, SFX_8095b_4_Ch5 - dbw CH7, SFX_80972_4_Ch7 - -SFX_80138_4:: - dbw ( $80 | CH4 ), SFX_80b05_4_Ch4 - dbw CH5, SFX_80b28_4_Ch5 - dbw CH7, SFX_80b43_4_Ch7 - -SFX_80141_4:: - dbw ( $80 | CH4 ), SFX_80b9c_4_Ch4 - dbw CH5, SFX_80bb7_4_Ch5 - dbw CH7, SFX_80bd2_4_Ch7 - -SFX_8014a_4:: - dbw ( $80 | CH4 ), SFX_80a23_4_Ch4 - dbw CH5, SFX_80a46_4_Ch5 - dbw CH7, SFX_80a6d_4_Ch7 - -SFX_80153_4:: - dbw ( $80 | CH4 ), SFX_80c3b_4_Ch4 - dbw CH5, SFX_80c4e_4_Ch5 - dbw CH7, SFX_80c61_4_Ch7 - -SFX_8015c_4:: - dbw ( $80 | CH4 ), SFX_80c6e_4_Ch4 - dbw CH5, SFX_80c81_4_Ch5 - dbw CH7, SFX_80c94_4_Ch7 - -SFX_80165_4:: - dbw ( $80 | CH4 ), SFX_80ca1_4_Ch4 - dbw CH5, SFX_80cc4_4_Ch5 - dbw CH7, SFX_80ce6_4_Ch7 - -SFX_8016e_4:: - dbw ( $80 | CH4 ), SFX_80ce7_4_Ch4 - dbw CH5, SFX_80cfa_4_Ch5 - dbw CH7, SFX_80d0d_4_Ch7 - -SFX_80177_4:: - dbw ( $80 | CH4 ), SFX_803da_4_Ch4 - dbw CH5, SFX_803f1_4_Ch5 - dbw CH7, SFX_80404_4_Ch7 - -SFX_80180_4:: - dbw ( $80 | CH4 ), SFX_80411_4_Ch4 - dbw CH5, SFX_80434_4_Ch5 - dbw CH7, SFX_80457_4_Ch7 - -SFX_80189_4:: - dbw ( $80 | CH4 ), SFX_804bf_4_Ch4 - dbw CH5, SFX_804d6_4_Ch5 - dbw CH7, SFX_804ed_4_Ch7 +SFX_Unknown_80760:: + audio_header SFX_Unknown_80760, Ch5, Ch6, Ch8 + +SFX_Unknown_804fa:: + audio_header SFX_Unknown_804fa, Ch5, Ch6, Ch8 + +SFX_Unknown_808a9:: + audio_header SFX_Unknown_808a9, Ch5, Ch6, Ch8 + +SFX_Unknown_80689:: + audio_header SFX_Unknown_80689, Ch5, Ch6, Ch8 + +SFX_Unknown_80633:: + audio_header SFX_Unknown_80633, Ch5, Ch6, Ch8 + +SFX_Unknown_80661:: + audio_header SFX_Unknown_80661, Ch5, Ch6, Ch8 + +SFX_Unknown_80879:: + audio_header SFX_Unknown_80879, Ch5, Ch6, Ch8 + +SFX_Unknown_80383:: + audio_header SFX_Unknown_80383, Ch5, Ch6, Ch8 + +SFX_Unknown_8081e:: + audio_header SFX_Unknown_8081e, Ch5, Ch6, Ch8 + +SFX_Unknown_806af:: + audio_header SFX_Unknown_806af, Ch5, Ch6, Ch8 + +SFX_Unknown_80712:: + audio_header SFX_Unknown_80712, Ch5, Ch6, Ch8 + +SFX_Unknown_8077e:: + audio_header SFX_Unknown_8077e, Ch5, Ch6, Ch8 + +SFX_Unknown_80603:: + audio_header SFX_Unknown_80603, Ch5, Ch6, Ch8 + +SFX_Unknown_80545:: + audio_header SFX_Unknown_80545, Ch5, Ch6, Ch8 + +SFX_Unknown_8058b:: + audio_header SFX_Unknown_8058b, Ch5, Ch6, Ch8 + +SFX_Unknown_80467:: + audio_header SFX_Unknown_80467, Ch5, Ch6, Ch8 + +SFX_Unknown_8097f:: + audio_header SFX_Unknown_8097f, Ch5, Ch6, Ch8 + +SFX_Unknown_809b2:: + audio_header SFX_Unknown_809b2, Ch5, Ch6, Ch8 + +SFX_Unknown_809fb:: + audio_header SFX_Unknown_809fb, Ch5, Ch6, Ch8 + +SFX_Unknown_80a89:: + audio_header SFX_Unknown_80a89, Ch5, Ch6, Ch8 + +SFX_Unknown_8091c:: + audio_header SFX_Unknown_8091c, Ch5, Ch6, Ch8 + +SFX_Unknown_80ad2:: + audio_header SFX_Unknown_80ad2, Ch5, Ch6, Ch8 + +SFX_Unknown_80be2:: + audio_header SFX_Unknown_80be2, Ch5, Ch6, Ch8 + +SFX_Unknown_808fa:: + audio_header SFX_Unknown_808fa, Ch5, Ch6, Ch8 + +SFX_Unknown_80b53:: + audio_header SFX_Unknown_80b53, Ch5, Ch6, Ch8 + +SFX_Unknown_80944:: + audio_header SFX_Unknown_80944, Ch5, Ch6, Ch8 + +SFX_Unknown_80b05:: + audio_header SFX_Unknown_80b05, Ch5, Ch6, Ch8 + +SFX_Unknown_80b9c:: + audio_header SFX_Unknown_80b9c, Ch5, Ch6, Ch8 + +SFX_Unknown_80a23:: + audio_header SFX_Unknown_80a23, Ch5, Ch6, Ch8 + +SFX_Unknown_80c3b:: + audio_header SFX_Unknown_80c3b, Ch5, Ch6, Ch8 + +SFX_Unknown_80c6e:: + audio_header SFX_Unknown_80c6e, Ch5, Ch6, Ch8 + +SFX_Unknown_80ca1:: + audio_header SFX_Unknown_80ca1, Ch5, Ch6, Ch8 + +SFX_Unknown_80ce7:: + audio_header SFX_Unknown_80ce7, Ch5, Ch6, Ch8 + +SFX_Unknown_803da:: + audio_header SFX_Unknown_803da, Ch5, Ch6, Ch8 + +SFX_Unknown_80411:: + audio_header SFX_Unknown_80411, Ch5, Ch6, Ch8 + +SFX_Unknown_804bf:: + audio_header SFX_Unknown_804bf, Ch5, Ch6, Ch8 SFX_Get_Item1_4:: - dbw ( $80 | CH4 ), SFX_80e5a_4_Ch4 - dbw CH5, SFX_80e71_4_Ch5 - dbw CH6, SFX_80e81_4_Ch6 + audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7 SFX_Get_Item2_4:: - dbw ( $80 | CH4 ), SFX_80ec8_4_Ch4 - dbw CH5, SFX_80ee7_4_Ch5 - dbw CH6, SFX_80eff_4_Ch6 + audio_header SFX_Get_Item2_4, Ch5, Ch6, Ch7 SFX_Tink_4:: - dbw CH4, SFX_8028e_4_Ch4 + audio_header SFX_Tink_4, Ch5 -SFX_Heal_Ailment_4:: - dbw CH4, SFX_8027f_4_Ch4 +SFX_Unknown_8027f:: + audio_header SFX_Unknown_8027f, Ch5 -SFX_Start_Menu_4:: - dbw CH4, SFX_8026a_4_Ch4 +SFX_Unknown_8026a:: + audio_header SFX_Unknown_8026a, Ch5 -SFX_PressAB_4:: - dbw CH7, SFX_80263_4_Ch7 +SFX_Unknown_80263:: + audio_header SFX_Unknown_80263, Ch8 SFX_Surfing_Add_Points:: - dbw CH4, SFX_Surfing_Add_Points_Ch4 + audio_header SFX_Surfing_Add_Points, Ch5 SFX_Surfing_Jump:: - dbw CH7, SFX_Surfing_Jump_Ch7 + audio_header SFX_Surfing_Jump, Ch8 SFX_Surfing_Flip:: - dbw CH4, SFX_Surfing_Flip_Ch4 + audio_header SFX_Surfing_Flip, Ch5 SFX_Surfing_Land:: - dbw CH7, SFX_Surfing_Land_Ch7 + audio_header SFX_Surfing_Land, Ch8 -SFX_801bc_4:: - dbw CH4, SFX_802cc_4_Ch4 +SFX_Unknown_802cc:: + audio_header SFX_Unknown_802cc, Ch5 SFX_Surfing_Crash:: - dbw CH7, SFX_Surfing_Crash_Ch7 + audio_header SFX_Surfing_Crash, Ch8 SFX_Get_Item2_4_2:: - dbw ( $80 | CH4 ), SFX_Get_Item2_4_2_Ch1 - dbw CH5, SFX_Get_Item2_4_2_Ch2 - dbw CH6, SFX_Get_Item2_4_2_Ch3 + audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm index b5378a94..302e5cf9 100644 --- a/audio/music/bikeriding.asm +++ b/audio/music/bikeriding.asm @@ -1,704 +1,704 @@ Music_BikeRiding_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - G_ 2 + note G_, 2 Music_BikeRiding_branch_7dbc9:: octave 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 + 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 octave 3 - 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 - F_ 10 - notetype 12, 10, 6 - F_ 2 - E_ 2 - F_ 2 - G_ 10 - E_ 2 - D_ 2 - E_ 2 - F_ 6 - toggleperfectpitch - notetype 12, 11, 3 - E_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 2 - E_ 1 - F_ 1 - toggleperfectpitch - notetype 12, 11, 5 - G_ 6 - G_ 6 - A_ 2 - F_ 2 - G_ 6 - notetype 12, 11, 4 - G_ 2 - F_ 4 - notetype 12, 10, 4 - E_ 2 - D_ 2 - notetype 12, 9, 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 + note_type 12, 11, 6 + note F_, 10 + note_type 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 + toggle_perfect_pitch + note_type 12, 11, 3 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 2 + note E_, 1 + note F_, 1 + toggle_perfect_pitch + note_type 12, 11, 5 + note G_, 6 + note G_, 6 + note A_, 2 + note F_, 2 + note G_, 6 + note_type 12, 11, 4 + note G_, 2 + note F_, 4 + note_type 12, 10, 4 + note E_, 2 + note D_, 2 + note_type 12, 9, 3 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 3 - B_ 2 - A_ 1 - B_ 1 - A_ 2 - B_ 2 - octave 4 - C_ 2 - C_ 4 - C_ 2 + 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 octave 3 - A_ 2 - B_ 2 - B_ 2 - A_ 2 + note A_, 2 + note B_, 2 + note B_, 2 + note A_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 2 - B_ 1 + note A_, 2 + note B_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 1 + note C_, 1 + note D_, 1 octave 3 - B_ 1 - octave 4 - C_ 4 - notetype 12, 3, 13 - C_ 4 - notetype 12, 11, 4 - 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 + note B_, 1 + octave 4 + note C_, 4 + note_type 12, 3, -5 + note C_, 4 + note_type 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 + note_type 12, 11, 5 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - C_ 4 - F_ 4 - D_ 4 - F# 4 + note E_, 4 + note C_, 4 + note F_, 4 + note D_, 4 + note F#, 4 vibrato 10, 2, 6 - notetype 12, 8, 0 - G_ 16 - G_ 4 - notetype 12, 8, 7 - G_ 12 - notetype 12, 11, 5 + note_type 12, 8, 0 + note G_, 16 + note G_, 4 + note_type 12, 8, 7 + note G_, 12 + note_type 12, 11, 5 vibrato 8, 1, 4 - loopchannel 0, Music_BikeRiding_branch_7dbc9 + sound_loop 0, Music_BikeRiding_branch_7dbc9 Music_BikeRiding_Ch2:: - duty 2 + duty_cycle 2 vibrato 6, 1, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - C_ 2 + note C_, 2 Music_BikeRiding_branch_7dc75:: - E_ 4 - F_ 4 - G_ 4 + note E_, 4 + note F_, 4 + note G_, 4 octave 5 - C_ 4 - octave 4 - B_ 6 - A_ 1 - B_ 1 - A_ 10 - F_ 2 - G_ 2 - A_ 2 + 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 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 1 - B_ 1 + note B_, 2 + note A_, 1 + note B_, 1 octave 5 - C_ 6 - octave 4 - A_ 2 - G_ 4 - duty 3 - notetype 12, 8, 4 - A# 6 - duty 2 - notetype 12, 12, 5 + note C_, 6 + octave 4 + note A_, 2 + note G_, 4 + duty_cycle 3 + note_type 12, 8, 4 + note A#, 6 + duty_cycle 2 + note_type 12, 12, 5 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 10 + note A_, 10 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 10 - notetype 12, 12, 3 + note G_, 10 + note_type 12, 12, 3 octave 5 - C_ 4 - E_ 2 - D_ 2 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 4 - notetype 12, 12, 7 - D_ 10 - D_ 1 - C_ 1 - notetype 12, 11, 0 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 4 - 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 - F_ 1 - G_ 1 - A_ 1 - B_ 1 - notetype 12, 12, 3 + note C_, 2 + note_type 12, 11, 0 + note D_, 4 + note_type 12, 12, 7 + note D_, 10 + note D_, 1 + note C_, 1 + note_type 12, 11, 0 + octave 4 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 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 + note_type 6, 12, 2 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note_type 12, 12, 3 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 - octave 4 - B_ 4 - A_ 4 - G_ 2 - A# 4 - A_ 2 - G_ 4 - F_ 2 - E_ 2 - notetype 8, 12, 4 - A_ 4 - G_ 4 - F_ 4 - B_ 4 - A_ 4 - G_ 4 + 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 + note_type 8, 12, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note B_, 4 + note A_, 4 + note G_, 4 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 5 - D_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 7 - D_ 12 - C_ 4 - notetype 12, 11, 0 - octave 4 - B_ 4 - notetype 12, 12, 7 - B_ 12 - notetype 12, 12, 3 - loopchannel 0, Music_BikeRiding_branch_7dc75 + note D_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 7 + note D_, 12 + note C_, 4 + note_type 12, 11, 0 + octave 4 + note B_, 4 + note_type 12, 12, 7 + note B_, 12 + note_type 12, 12, 3 + sound_loop 0, Music_BikeRiding_branch_7dc75 Music_BikeRiding_Ch3:: - notetype 12, 1, 3 + note_type 12, 1, 3 rest 2 Music_BikeRiding_branch_7dd17:: octave 4 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - loopchannel 0, Music_BikeRiding_branch_7dd17 + sound_loop 0, Music_BikeRiding_branch_7dd17 Music_BikeRiding_Ch4:: - dspeed 12 + drum_speed 12 rest 2 Music_BikeRiding_branch_7de6a:: - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dec2 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7deb4 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - callchannel Music_BikeRiding_branch_7dea7 - loopchannel 0, Music_BikeRiding_branch_7de6a + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dec2 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dec2 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7deb4 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_call Music_BikeRiding_branch_7dea7 + sound_loop 0, Music_BikeRiding_branch_7de6a Music_BikeRiding_branch_7dea7:: rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 - endchannel + drum_note 16, 2 + sound_ret Music_BikeRiding_branch_7deb4:: rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 - triangle3 2 - triangle3 2 - endchannel + drum_note 16, 2 + drum_note 16, 2 + drum_note 16, 2 + sound_ret Music_BikeRiding_branch_7dec2:: rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 2 + drum_note 16, 2 rest 2 - triangle3 1 - triangle3 1 - endchannel + drum_note 16, 1 + drum_note 16, 1 + sound_ret diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm index 3f015d8d..5f03fc51 100644 --- a/audio/music/celadon.asm +++ b/audio/music/celadon.asm @@ -1,411 +1,411 @@ Music_Celadon_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 2, 15 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 2, -7 rest 8 octave 3 - D_ 8 + note D_, 8 Music_Celadon_branch_b6d4:: - duty 2 - notetype 12, 11, 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 + duty_cycle 2 + note_type 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 octave 3 - A_ 8 - F# 4 - A_ 4 - F# 2 - A_ 6 - A_ 1 - B_ 1 - octave 4 - C_ 1 + 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 octave 3 - B_ 1 - A_ 2 - B_ 2 - G_ 4 + note B_, 1 + note A_, 2 + note B_, 2 + note G_, 4 octave 4 - G_ 4 + note G_, 4 octave 3 - G_ 4 - B_ 4 - G_ 2 - B_ 4 - G_ 2 - E_ 1 - F# 1 - G_ 1 - A_ 1 - B_ 2 - octave 4 - C_ 2 + 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 octave 3 - A_ 8 - A_ 2 - B_ 2 + note A_, 8 + note A_, 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - 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 - B_ 8 - G_ 4 - D_ 4 - G_ 4 - A_ 2 - octave 4 - C_ 2 + 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 + note_type 12, 9, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 octave 3 - 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 + 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 octave 3 - B_ 8 - A_ 8 - F# 4 - G_ 4 - A_ 4 - G_ 4 - F# 4 - A_ 4 - loopchannel 0, Music_Celadon_branch_b6d4 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + sound_loop 0, Music_Celadon_branch_b6d4 Music_Celadon_Ch2:: - duty 3 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 10, 0 - A_ 8 + duty_cycle 3 + note_type 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 + note_type 12, 10, 0 + note A_, 8 Music_Celadon_branch_b74a:: - duty 2 - notetype 12, 12, 2 - octave 4 - B_ 4 - G_ 4 - B_ 2 - G_ 6 - B_ 1 - G_ 1 - A_ 1 - B_ 1 + duty_cycle 2 + note_type 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 octave 5 - 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 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - B_ 1 - G_ 1 - A_ 1 - B_ 1 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 5 - 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 + 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 octave 5 - D_ 8 - notetype 12, 11, 4 + note D_, 8 + note_type 12, 11, 4 octave 4 - D_ 8 - C_ 2 + note D_, 8 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - octave 4 - E_ 4 - F# 4 - D_ 8 - C_ 8 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note F#, 4 + note D_, 8 + note C_, 8 octave 3 - A_ 2 - B_ 2 - octave 4 - C_ 2 - D_ 2 - E_ 2 - C_ 2 - D_ 2 - E_ 2 - D_ 8 - D_ 8 - C_ 2 + 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 octave 3 - 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 + 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 + sound_loop 0, Music_Celadon_branch_b74a Music_Celadon_Ch3:: - notetype 12, 1, 3 + note_type 12, 1, 3 rest 8 octave 5 - D_ 1 - C# 1 - D_ 1 - E_ 1 - F# 1 - E_ 1 - F# 1 - G_ 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 Music_Celadon_branch_b7c1:: octave 4 - 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 + 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 rest 6 - F# 2 + note F#, 2 rest 4 - F# 2 - G_ 2 + note F#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 - B_ 2 - G_ 2 + note G_, 2 + note B_, 2 + note G_, 2 octave 5 - E_ 2 - D_ 2 - C_ 2 - D_ 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 octave 4 - B_ 2 - G_ 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 - C_ 2 - octave 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - loopchannel 0, Music_Celadon_branch_b7c1 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + sound_loop 0, Music_Celadon_branch_b7c1 diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm index 4fe93c31..69496af5 100644 --- a/audio/music/cinnabar.asm +++ b/audio/music/cinnabar.asm @@ -1,354 +1,354 @@ Music_Cinnabar_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Cinnabar_branch_b878:: - notetype 12, 11, 5 + note_type 12, 11, 5 rest 4 octave 3 - D_ 4 - E_ 6 - C# 2 - notetype 12, 11, 1 - D_ 4 - notetype 12, 11, 5 - B_ 4 + note D_, 4 + note E_, 6 + note C#, 2 + note_type 12, 11, 1 + note D_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - notetype 12, 11, 1 - B_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 2 - F# 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - G_ 4 - F# 4 - E_ 4 - D_ 4 - E_ 4 - F# 6 - A_ 2 - notetype 12, 11, 1 - G_ 4 - notetype 12, 11, 5 - B_ 4 + note A_, 2 + note_type 12, 11, 1 + note B_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + note_type 12, 11, 1 + note G_, 4 + note_type 12, 11, 5 + note B_, 4 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - B_ 4 - G_ 4 - F# 3 - E_ 1 - F# 2 - A_ 2 - notetype 12, 10, 2 - G_ 4 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + note_type 12, 10, 2 + note G_, 4 octave 4 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 7, 2 - D_ 1 - E_ 1 - D_ 4 - notetype 12, 10, 7 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 7, 2 + note D_, 1 + note E_, 1 + note D_, 4 + note_type 12, 10, 7 octave 3 - B_ 6 - G_ 2 - E_ 8 + note B_, 6 + note G_, 2 + note E_, 8 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 2 - F# 8 + note A_, 2 + note F#, 8 octave 4 - F# 6 - D_ 2 + note F#, 6 + note D_, 2 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - G_ 8 - F# 4 - E_ 4 - loopchannel 0, Music_Cinnabar_branch_b878 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + sound_loop 0, Music_Cinnabar_branch_b878 Music_Cinnabar_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 3 Music_Cinnabar_branch_b8d9:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - G_ 6 - A_ 1 - B_ 1 + note G_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 octave 3 - B_ 8 - A_ 4 - G_ 6 - A_ 1 - B_ 1 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 6 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 - G_ 4 - A_ 6 - G_ 1 - F# 1 - E_ 4 - D_ 4 - C_ 3 + note C_, 6 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 2 - D_ 1 - E_ 1 - notetype 12, 12, 1 - D_ 4 - notetype 12, 12, 7 + note C_, 2 + note D_, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 4 + note_type 12, 12, 7 octave 3 - A_ 4 - G_ 4 - F# 4 - notetype 12, 11, 0 + note A_, 4 + note G_, 4 + note F#, 4 + note_type 12, 11, 0 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 2 - G_ 8 + note B_, 2 + note G_, 8 octave 4 - E_ 6 - C_ 2 + note E_, 6 + note C_, 2 octave 3 - A_ 8 + note A_, 8 octave 4 - A_ 6 - F# 2 - D_ 2 - C_ 2 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - B_ 4 + note B_, 2 + note A_, 2 + note B_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 2 - A_ 6 - loopchannel 0, Music_Cinnabar_branch_b8d9 + note B_, 2 + note A_, 6 + sound_loop 0, Music_Cinnabar_branch_b8d9 Music_Cinnabar_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 Music_Cinnabar_branch_b93f:: octave 4 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 2 - G_ 1 - G_ 1 - A_ 1 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - B_ 4 - A_ 1 + note B_, 4 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 + note D_, 2 octave 4 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 1 + note B_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 octave 5 - E_ 2 - C_ 1 - C_ 1 - C_ 1 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 rest 1 - C_ 1 + note C_, 1 rest 1 - E_ 2 - C_ 1 + note E_, 2 + note C_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 3 octave 5 - A_ 2 - F# 1 - F# 1 - D_ 1 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 3 octave 5 - D_ 2 - C_ 1 - C_ 1 + note D_, 2 + note C_, 1 + note C_, 1 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 2 + note A_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 - loopchannel 0, Music_Cinnabar_branch_b93f + sound_loop 0, Music_Cinnabar_branch_b93f diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm index 438c2f18..ac6c08c3 100644 --- a/audio/music/cinnabarmansion.asm +++ b/audio/music/cinnabarmansion.asm @@ -2,171 +2,171 @@ Music_CinnabarMansion_Ch1:: tempo 144 volume 7, 7 vibrato 11, 2, 5 - duty 2 + duty_cycle 2 Music_CinnabarMansion_branch_7ed19:: - notetype 12, 6, 2 + note_type 12, 6, 2 octave 5 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - B_ 1 - B_ 1 - C_ 1 + note B_, 1 + note B_, 1 + note C_, 1 rest 2 octave 5 - B_ 2 - E_ 2 + note B_, 2 + note E_, 2 octave 4 - C_ 2 - B_ 2 - E_ 2 - C_ 1 + note C_, 2 + note B_, 2 + note E_, 2 + note C_, 1 octave 5 - B_ 1 + note B_, 1 rest 2 - loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, 10, 5 + sound_loop 14, Music_CinnabarMansion_branch_7ed19 + note_type 12, 10, 5 rest 16 rest 16 rest 15 octave 4 - C_ 1 + note C_, 1 octave 5 - B_ 1 - B_ 2 - loopchannel 0, Music_CinnabarMansion_branch_7ed19 + note B_, 1 + note B_, 2 + sound_loop 0, Music_CinnabarMansion_branch_7ed19 Music_CinnabarMansion_Ch2:: - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch vibrato 10, 2, 4 - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed48:: rest 16 rest 16 - loopchannel 4, Music_CinnabarMansion_branch_7ed48 + sound_loop 4, Music_CinnabarMansion_branch_7ed48 Music_CinnabarMansion_branch_7ed4e:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_CinnabarMansion_branch_7ed50:: - callchannel Music_CinnabarMansion_branch_7ed6c - loopchannel 3, Music_CinnabarMansion_branch_7ed50 + sound_call Music_CinnabarMansion_branch_7ed6c + sound_loop 3, Music_CinnabarMansion_branch_7ed50 octave 3 - E_ 4 - D# 4 - B_ 4 - A# 4 - G_ 4 - G# 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 rest 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 + 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 + sound_loop 0, Music_CinnabarMansion_branch_7ed4e Music_CinnabarMansion_branch_7ed6c:: octave 3 - 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 + 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 rest 4 - A# 4 - endchannel + note A#, 4 + sound_ret Music_CinnabarMansion_Ch3:: - notetype 12, 1, 1 + note_type 12, 1, 1 Music_CinnabarMansion_branch_7ed80:: octave 2 - B_ 2 + note B_, 2 rest 2 octave 3 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 3 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - loopchannel 8, Music_CinnabarMansion_branch_7ed80 - E_ 16 - D# 16 - G_ 16 - G# 8 - D# 8 - loopchannel 0, Music_CinnabarMansion_branch_7ed80 + sound_loop 8, Music_CinnabarMansion_branch_7ed80 + note E_, 16 + note D#, 16 + note G_, 16 + note G#, 8 + note D#, 8 + sound_loop 0, Music_CinnabarMansion_branch_7ed80 Music_CinnabarMansion_Ch4:: - dspeed 6 + drum_speed 6 rest 16 rest 16 rest 16 rest 16 Music_CinnabarMansion_branch_7edb5:: - 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 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 14, 4 + drum_note 12, 2 + drum_note 12, 2 rest 2 rest 10 rest 8 - cymbal3 8 - loopchannel 0, Music_CinnabarMansion_branch_7edb5 + drum_note 14, 8 + sound_loop 0, Music_CinnabarMansion_branch_7edb5 diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm index eb9ccde5..00ca3b5f 100644 --- a/audio/music/cities1.asm +++ b/audio/music/cities1.asm @@ -1,6 +1,6 @@ Music_Cities1_branch_aa6f:: tempo 232 - loopchannel 0, Music_Cities1_branch_aa79 + sound_loop 0, Music_Cities1_branch_aa79 Music_Cities1_Ch1:: tempo 144 @@ -8,650 +8,650 @@ Music_Cities1_Ch1:: Music_Cities1_branch_aa79:: volume 7, 7 vibrato 8, 2, 4 - duty 3 + duty_cycle 3 Music_Cities1_branch_aa80:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - 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 - C# 4 + 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 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 6 + note B_, 6 octave 3 - C# 2 - C# 4 + note C#, 2 + note C#, 4 octave 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 6 - E_ 2 + note D#, 6 + note E_, 2 octave 2 - B_ 4 - notetype 12, 10, 5 + note B_, 4 + note_type 12, 10, 5 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 - A_ 4 - B_ 4 - B_ 2 + note B_, 2 + note A_, 4 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 5 - 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 - C# 2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 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 + note_type 12, 10, 5 + note C#, 2 octave 2 - A_ 2 - B_ 6 + note A_, 2 + note B_, 6 octave 3 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 2 - B_ 2 - B_ 4 - notetype 12, 12, 5 - callchannel Music_Cities1_branch_ab7d + note B_, 2 + note B_, 4 + note_type 12, 12, 5 + sound_call Music_Cities1_branch_ab7d octave 3 - D# 4 - D# 2 - E_ 2 + note D#, 4 + note D#, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - E_ 4 + note C#, 2 + note G#, 2 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - notetype 12, 10, 5 - C# 4 + note E_, 2 + note_type 12, 10, 5 + note C#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - C# 2 - E_ 4 - notetype 12, 11, 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 4 - F# 4 - G# 2 - E_ 2 + note D#, 4 + note C#, 2 + note E_, 4 + note_type 12, 11, 3 + sound_call 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 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 4 - G# 2 + note E_, 4 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 Music_Cities1_branch_ab12:: - C# 2 - D# 2 - C# 2 + note C#, 2 + note D#, 2 + note C#, 2 octave 2 - B_ 4 - B_ 2 + note B_, 4 + note B_, 2 octave 3 - C# 2 - D# 2 - loopchannel 2, Music_Cities1_branch_ab12 - E_ 2 + note C#, 2 + note D#, 2 + sound_loop 2, Music_Cities1_branch_ab12 + note E_, 2 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - G# 2 - G# 2 + note C#, 2 + note G#, 2 + note G#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - callchannel Music_Cities1_branch_ab8a - A_ 2 - E_ 2 - A_ 2 - B_ 2 - A_ 2 - G# 2 - A_ 2 - F# 2 - G# 2 - E_ 2 + sound_call 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 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 4 - F# 2 - D# 2 - D# 2 - F# 2 + note D#, 4 + note F#, 2 + note D#, 2 + note D#, 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D# 2 - notetype 12, 11, 6 - F# 8 - F# 4 - D# 4 - E_ 8 - notetype 12, 8, 4 + note D#, 2 + note_type 12, 11, 6 + note F#, 8 + note F#, 4 + note D#, 4 + note E_, 8 + note_type 12, 8, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - F# 2 - loopchannel 0, Music_Cities1_branch_aa80 + note E_, 2 + note F#, 2 + sound_loop 0, Music_Cities1_branch_aa80 Music_Cities1_branch_ab7d:: octave 3 - F# 2 - D# 4 - E_ 2 - D# 4 - C# 4 + note F#, 2 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 - D# 2 - C# 2 - endchannel + note C#, 2 + note D#, 2 + note C#, 2 + sound_ret Music_Cities1_branch_ab8a:: - A_ 2 - E_ 2 - C# 2 - E_ 4 - A_ 2 - C# 2 - E_ 2 - endchannel + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + sound_ret Music_Cities1_Ch2:: vibrato 5, 1, 5 - callchannel Music_Cities1_branch_ac00 + sound_call Music_Cities1_branch_ac00 octave 4 - G# 2 - notetype 12, 12, 4 - E_ 6 - notetype 12, 12, 5 - duty 3 + note G#, 2 + note_type 12, 12, 4 + note E_, 6 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - C# 4 - D# 4 - E_ 6 - F# 6 - G# 4 - callchannel Music_Cities1_branch_ac00 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + sound_call Music_Cities1_branch_ac00 octave 4 - G# 2 - notetype 12, 12, 4 - E_ 14 - duty 3 + note G#, 2 + note_type 12, 12, 4 + note E_, 14 + duty_cycle 3 octave 3 - E_ 6 - F# 6 - G# 4 - notetype 12, 11, 7 - duty 2 + note E_, 6 + note F#, 6 + note G#, 4 + note_type 12, 11, 7 + duty_cycle 2 vibrato 8, 1, 7 octave 5 - C# 12 + note C#, 12 octave 4 - A_ 4 + note A_, 4 octave 5 - E_ 8 - F# 2 - E_ 2 - D# 2 - C# 2 + note E_, 8 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 4 - 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 + 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 octave 5 - C# 12 - D# 2 - E_ 2 - F# 4 - E_ 4 - D# 4 - C# 4 + note C#, 12 + note D#, 2 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 octave 4 - B_ 12 + note B_, 12 octave 5 - C# 2 - D# 2 - C# 4 + note C#, 2 + note D#, 2 + note C#, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - A_ 12 - B_ 2 + note B_, 4 + note A_, 4 + note G#, 4 + note A_, 12 + note B_, 2 octave 5 - C_ 2 - C_ 4 + note C_, 2 + note C_, 4 octave 4 - B_ 4 - A_ 4 - F# 4 - notetype 12, 11, 7 - A_ 8 + note B_, 4 + note A_, 4 + note F#, 4 + note_type 12, 11, 7 + note A_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 14 - notetype 12, 8, 4 - G# 1 - notetype 12, 10, 4 - A_ 1 - loopchannel 0, Music_Cities1_Ch2 + note B_, 14 + note_type 12, 8, 4 + note G#, 1 + note_type 12, 10, 4 + note A_, 1 + sound_loop 0, Music_Cities1_Ch2 Music_Cities1_branch_ac00:: - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 - B_ 4 - A_ 4 - notetype 12, 12, 4 - G# 10 - notetype 12, 12, 3 - G# 2 - A_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 5 - duty 3 + note B_, 4 + note A_, 4 + note_type 12, 12, 4 + note G#, 10 + note_type 12, 12, 3 + note G#, 2 + note A_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - E_ 4 - D# 8 - E_ 4 - F# 4 - notetype 12, 12, 3 - duty 2 + note E_, 4 + note D#, 8 + note E_, 4 + note F#, 4 + note_type 12, 12, 3 + duty_cycle 2 octave 4 - A_ 4 - G# 4 - notetype 12, 12, 4 - F# 10 - notetype 12, 12, 3 - F# 2 - G# 2 - A_ 4 - A_ 2 - G# 2 - F# 2 - endchannel + note A_, 4 + note G#, 4 + note_type 12, 12, 4 + note F#, 10 + note_type 12, 12, 3 + note F#, 2 + note G#, 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + sound_ret Music_Cities1_Ch3:: - notetype 12, 1, 1 - toggleperfectpitch + note_type 12, 1, 1 + toggle_perfect_pitch Music_Cities1_branch_ac35:: vibrato 0, 0, 0 octave 4 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - B_ 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - callchannel Music_Cities1_branch_acc5 - callchannel Music_Cities1_branch_acce - G# 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 + sound_call Music_Cities1_branch_acc5 + sound_call Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - G# 2 - E_ 2 - B_ 2 + note G#, 2 + note E_, 2 + note B_, 2 rest 2 - E_ 2 - F# 2 - E_ 2 - G# 2 - E_ 2 - B_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 vibrato 8, 2, 5 - 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 + 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 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - 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 + 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 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - F# 2 - B_ 2 - A_ 2 - A_ 4 - G# 4 - F# 2 - D# 2 - A_ 2 - F# 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 rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 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 + 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 + sound_loop 0, Music_Cities1_branch_ac35 Music_Cities1_branch_acc5:: rest 2 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 rest 2 - E_ 2 - F# 2 - G# 2 - endchannel + note E_, 2 + note F#, 2 + note G#, 2 + sound_ret Music_Cities1_branch_acce:: - A_ 2 - F# 2 - G# 2 - A_ 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 rest 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - F# 2 - D# 2 - D# 2 - E_ 2 - F# 2 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 + note D#, 2 + note E_, 2 + note F#, 2 rest 2 - D# 2 - E_ 2 - F# 2 - endchannel + note D#, 2 + note E_, 2 + note F#, 2 + sound_ret Music_Cities1_Ch4:: - dspeed 12 - callchannel Music_Cities1_branch_ad36 + drum_speed 12 + sound_call Music_Cities1_branch_ad36 Music_Cities1_branch_acf3:: - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad45 - callchannel Music_Cities1_branch_ad45 - loopchannel 2, Music_Cities1_branch_acf3 - callchannel Music_Cities1_branch_ad36 - callchannel Music_Cities1_branch_ad5f - callchannel Music_Cities1_branch_ad52 - 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 - 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 + sound_call Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad45 + sound_call Music_Cities1_branch_ad45 + sound_loop 2, Music_Cities1_branch_acf3 + sound_call Music_Cities1_branch_ad36 + sound_call Music_Cities1_branch_ad5f + sound_call Music_Cities1_branch_ad52 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + sound_call Music_Cities1_branch_ad6e + sound_call Music_Cities1_branch_ad5f + sound_call Music_Cities1_branch_ad52 + sound_call Music_Cities1_branch_ad6e + sound_call Music_Cities1_branch_ad52 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 6 + drum_note 6, 4 + drum_note 6, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_loop 0, Music_Cities1_Ch4 Music_Cities1_branch_ad36:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 2 - snare6 2 - endchannel + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 2 + drum_note 8, 2 + sound_ret Music_Cities1_branch_ad45:: - snare6 6 - snare6 6 - snare6 4 - snare6 6 - snare6 6 - snare6 4 - endchannel + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 6 + drum_note 8, 6 + drum_note 8, 4 + sound_ret Music_Cities1_branch_ad52:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 4 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + sound_ret Music_Cities1_branch_ad5f:: - triangle1 6 - triangle1 6 - triangle2 4 - triangle1 6 - triangle1 6 - triangle2 2 - triangle1 2 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 4 + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 6, 2 + sound_ret Music_Cities1_branch_ad6e:: - triangle1 6 - triangle1 6 - triangle2 2 - triangle2 2 - endchannel + drum_note 6, 6 + drum_note 6, 6 + drum_note 7, 2 + drum_note 7, 2 + sound_ret diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm index 897fb8c9..6397f965 100644 --- a/audio/music/cities2.asm +++ b/audio/music/cities2.asm @@ -1,416 +1,416 @@ Music_Cities2_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 2 - toggleperfectpitch - notetype 12, 11, 6 + toggle_perfect_pitch + note_type 12, 11, 6 rest 8 octave 3 - E_ 2 - D# 2 - C# 2 - C_ 2 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 octave 2 - B_ 2 + note B_, 2 rest 14 Music_Cities2_branch_b51a:: octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 - D# 1 - D_ 1 - C# 4 + note C#, 2 + note D#, 1 + note D_, 1 + note C#, 4 octave 3 - B_ 4 - G# 8 - E_ 8 - A_ 4 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + 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 octave 4 - C# 2 + note C#, 2 rest 16 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 1 - D# 1 - C# 4 + note C#, 1 + note D#, 1 + note C#, 4 octave 3 - B_ 4 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 3 - G# 8 - B_ 4 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - E_ 2 - F# 2 - G# 2 + 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 rest 2 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - F# 2 - G# 2 - A_ 2 + note B_, 4 + note F#, 2 + note G#, 2 + note A_, 2 rest 2 octave 4 - F# 4 - D# 4 + note F#, 4 + note D#, 4 octave 3 - E_ 2 + note E_, 2 rest 4 - F# 2 + note F#, 2 rest 4 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 16 rest 16 rest 14 - E_ 16 - F# 8 - G# 4 - F# 4 - E_ 2 + note E_, 16 + note F#, 8 + note G#, 4 + note F#, 4 + note E_, 2 rest 14 - loopchannel 0, Music_Cities2_branch_b51a + sound_loop 0, Music_Cities2_branch_b51a Music_Cities2_Ch2:: - duty 3 + duty_cycle 3 vibrato 8, 2, 3 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 6 - notetype 12, 12, 2 - duty 2 + note C#, 2 + note D#, 2 + note E_, 6 + note_type 12, 12, 2 + duty_cycle 2 octave 4 - E_ 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 Music_Cities2_branch_b58b:: - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 14 - notetype 12, 12, 2 - E_ 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 14 + note_type 12, 12, 2 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - notetype 12, 12, 2 - E_ 1 - G# 1 - notetype 12, 12, 5 - B_ 14 - notetype 12, 12, 2 - E_ 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note_type 12, 12, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 5 + note B_, 14 + note_type 12, 12, 2 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 10, 6 - G# 6 - notetype 12, 12, 2 - A_ 1 - G# 1 - notetype 12, 12, 4 - F# 8 - notetype 12, 10, 1 - duty 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 10, 6 + note G#, 6 + note_type 12, 12, 2 + note A_, 1 + note G#, 1 + note_type 12, 12, 4 + note F#, 8 + note_type 12, 10, 1 + duty_cycle 1 octave 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - notetype 12, 12, 2 - duty 2 + note_type 12, 12, 2 + duty_cycle 2 octave 4 - E_ 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 4 - G# 6 - E_ 1 - G# 1 - notetype 12, 12, 6 - B_ 8 - notetype 12, 12, 2 - C# 1 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 4 + note G#, 6 + note E_, 1 + note G#, 1 + note_type 12, 12, 6 + note B_, 8 + note_type 12, 12, 2 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - E_ 4 - notetype 12, 12, 7 - G# 4 - E_ 4 - notetype 12, 12, 2 - D# 1 - C# 1 - D# 1 - E_ 1 - F# 4 - notetype 12, 12, 7 - B_ 4 - F# 4 - notetype 12, 12, 2 - C# 1 + note C#, 1 + note D#, 1 + note E_, 4 + note_type 12, 12, 7 + note G#, 4 + note E_, 4 + note_type 12, 12, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 4 + note_type 12, 12, 7 + note B_, 4 + note F#, 4 + note_type 12, 12, 2 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - 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 + 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 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D# 1 - F# 1 - notetype 12, 12, 2 - B_ 8 - notetype 12, 11, 7 + note C#, 1 + note D#, 1 + note F#, 1 + note_type 12, 12, 2 + note B_, 8 + note_type 12, 11, 7 octave 3 - E_ 8 + note E_, 8 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - G# 4 - A_ 4 - B_ 8 - B_ 8 - G# 4 + note F#, 4 + note G#, 4 + note A_, 4 + note B_, 8 + note B_, 8 + note G#, 4 octave 4 - D# 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 2 - notetype 12, 12, 2 - E_ 6 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note_type 12, 12, 2 + note E_, 6 + note E_, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 2 - D# 2 - E_ 1 - F# 1 - G# 1 - A_ 1 - loopchannel 0, Music_Cities2_branch_b58b + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + sound_loop 0, Music_Cities2_branch_b58b Music_Cities2_Ch3:: - notetype 12, 1, 1 + note_type 12, 1, 1 rest 16 octave 4 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 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 Music_Cities2_branch_b64c:: - 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 + 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 rest 2 - E_ 4 - G# 4 - F# 2 - A_ 2 - F# 2 + note E_, 4 + note G#, 4 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - F# 4 - A_ 4 - C# 2 + note F#, 4 + note A_, 4 + note C#, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - G# 2 - A_ 2 - B_ 2 + note G#, 2 + note A_, 2 + note B_, 2 rest 8 - 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 + 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 + sound_loop 0, Music_Cities2_branch_b64c diff --git a/audio/music/credits.asm b/audio/music/credits.asm index d9a5ec35..b8a6d7dd 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,820 +1,820 @@ Music_Credits_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 4 - E_ 6 + note E_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - E_ 1 - D_ 6 + note E_, 1 + note D_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - D_ 1 - C# 6 + note D_, 1 + note C#, 6 octave 3 - F# 1 - octave 4 - C# 1 - D_ 4 - E_ 2 - C# 1 - E_ 1 - C# 1 + note F#, 1 + octave 4 + note C#, 1 + note D_, 4 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 1 rest 1 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 - E_ 1 - F# 1 - G_ 1 - notetype 12, 11, 6 - 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 + note E_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note_type 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 octave 3 - B_ 2 - A_ 2 - D_ 4 - E_ 2 - F# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - notetype 12, 11, 7 - E_ 6 - A_ 2 - G_ 4 - F# 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - octave 4 - C# 4 - D_ 4 + 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 + note_type 12, 11, 7 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 9, 0 - G_ 8 - F# 8 - E_ 8 - D_ 8 + 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_type 12, 9, 0 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 rest 16 rest 16 rest 8 - notetype 12, 11, 6 - E_ 6 - D# 1 - D_ 1 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 + note_type 12, 11, 6 + note E_, 6 + note D#, 1 + note D_, 1 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 rest 16 rest 16 rest 8 - E_ 6 - C# 1 - E_ 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 11, 6 - G_ 6 - D_ 4 - G_ 2 - B_ 4 - notetype 12, 11, 7 - G_ 8 - F# 4 - G# 4 - notetype 12, 9, 0 - A_ 8 - F# 8 - E_ 8 - C# 8 - notetype 12, 11, 7 - D_ 8 - C# 8 + note E_, 6 + note C#, 1 + note E_, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 11, 6 + note G_, 6 + note D_, 4 + note G_, 2 + note B_, 4 + note_type 12, 11, 7 + note G_, 8 + note F#, 4 + note G#, 4 + note_type 12, 9, 0 + note A_, 8 + note F#, 8 + note E_, 8 + note C#, 8 + note_type 12, 11, 7 + note D_, 8 + note C#, 8 octave 2 - B_ 8 + note B_, 8 octave 3 - D_ 8 - notetype 12, 9, 0 - E_ 8 - D_ 8 - F# 8 - E_ 8 - notetype 12, 10, 0 - D_ 8 - E_ 8 - D_ 8 - C_ 8 - G_ 8 - F_ 8 - E_ 8 - D_ 8 - notetype 12, 10, 0 - C# 6 - notetype 12, 10, 7 - C# 6 - notetype 12, 11, 7 - D_ 4 - E_ 8 - G_ 6 - F# 1 - F_ 1 - notetype 12, 10, 0 - E_ 6 - notetype 12, 10, 7 - E_ 6 - notetype 12, 11, 7 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 7 - 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 - E_ 6 - notetype 12, 11, 7 - D_ 2 - G_ 4 - F# 4 - E_ 4 - F# 4 - A_ 4 - B_ 4 - notetype 12, 10, 0 - octave 4 - C# 16 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 11, 5 + note D_, 8 + note_type 12, 9, 0 + note E_, 8 + note D_, 8 + note F#, 8 + note E_, 8 + note_type 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 + note_type 12, 10, 0 + note C#, 6 + note_type 12, 10, 7 + note C#, 6 + note_type 12, 11, 7 + note D_, 4 + note E_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 10, 7 + note E_, 6 + note_type 12, 11, 7 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 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 + note_type 12, 10, 0 + note E_, 6 + note_type 12, 11, 7 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note_type 12, 10, 0 + octave 4 + note C#, 16 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 11, 5 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - notetype 12, 11, 1 - A_ 8 - endchannel + note A_, 1 + note A_, 1 + note_type 12, 11, 1 + note A_, 8 + sound_ret Music_Credits_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 5 - octave 4 - A_ 6 - E_ 1 - A_ 1 - G_ 6 - D_ 1 - G_ 1 - notetype 12, 12, 7 - F# 12 - G# 2 - E_ 1 - G# 1 - notetype 12, 12, 2 - A_ 2 - notetype 12, 12, 1 + note_type 12, 12, 5 + octave 4 + note A_, 6 + note E_, 1 + note A_, 1 + note G_, 6 + note D_, 1 + note G_, 1 + note_type 12, 12, 7 + note F#, 12 + note G#, 2 + note E_, 1 + note G#, 1 + note_type 12, 12, 2 + note A_, 2 + note_type 12, 12, 1 octave 3 - 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 - A_ 1 - F# 1 - A_ 1 - B_ 1 - notetype 12, 12, 7 - octave 4 - C# 6 - C# 1 - D_ 1 - E_ 4 - C# 4 - G_ 4 - F# 4 - E_ 4 - D_ 4 - C# 6 + 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 + note_type 12, 12, 4 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + note_type 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 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 8 + note E_, 8 octave 3 - 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 + 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 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 8 + note E_, 8 octave 3 - A_ 6 - E_ 2 - notetype 12, 11, 0 + note A_, 6 + note E_, 2 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 12, 7 - D_ 6 + note C#, 8 + note_type 12, 12, 7 + note D_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 8 + note G_, 8 octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 - octave 4 - C# 6 - notetype 12, 11, 7 - C# 6 - D_ 4 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 8 - notetype 12, 12, 7 - D_ 6 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note D_, 4 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 8 + note G_, 8 octave 3 - G_ 6 - D_ 2 - B_ 8 - notetype 12, 11, 0 - octave 4 - E_ 7 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 3 - E_ 1 - G# 1 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 6 - G_ 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 10, 0 - C# 8 - notetype 12, 10, 7 - C# 8 - notetype 12, 9, 0 + note G_, 6 + note D_, 2 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note E_, 7 + note_type 12, 11, 7 + note E_, 7 + note_type 12, 12, 3 + note E_, 1 + note G#, 1 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 6 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 10, 0 + note C#, 8 + note_type 12, 10, 7 + note C#, 8 + note_type 12, 9, 0 octave 3 - A_ 8 - notetype 12, 9, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 12, 7 - D_ 8 - G_ 6 - F# 1 - F_ 1 - E_ 8 - notetype 12, 11, 7 - G_ 6 - F# 1 - F_ 1 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 + note A_, 8 + note_type 12, 9, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 12, 7 + note D_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note_type 12, 11, 7 + note G_, 6 + note F#, 1 + note F_, 1 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 octave 2 - B_ 8 + note B_, 8 octave 3 - F# 6 - D_ 1 - F# 1 - E_ 8 - B_ 6 - G_ 1 - B_ 1 - notetype 12, 11, 0 - octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 - D_ 8 - notetype 12, 11, 7 - D_ 8 - notetype 12, 12, 7 + note F#, 6 + note D_, 1 + note F#, 1 + note E_, 8 + note B_, 6 + note G_, 1 + note B_, 1 + note_type 12, 11, 0 + octave 4 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 + note D_, 8 + note_type 12, 11, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 8 + note B_, 8 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 1 - octave 4 - D_ 1 - notetype 12, 11, 0 - C# 6 - notetype 12, 11, 7 - C# 6 - notetype 12, 12, 7 + note B_, 1 + octave 4 + note D_, 1 + note_type 12, 11, 0 + note C#, 6 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 12, 7 octave 3 - B_ 4 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - F# 6 - notetype 12, 11, 7 - F# 6 - notetype 12, 12, 7 - G# 4 - A_ 8 - F# 8 - notetype 12, 11, 0 - G# 6 - notetype 12, 11, 7 - G# 6 - notetype 12, 12, 7 - A_ 4 - B_ 8 - G# 8 - notetype 12, 11, 0 - A_ 6 - notetype 12, 11, 7 - A_ 6 - notetype 12, 12, 7 - B_ 4 - octave 4 - C_ 8 + note B_, 4 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note F#, 6 + note_type 12, 11, 7 + note F#, 6 + note_type 12, 12, 7 + note G#, 4 + note A_, 8 + note F#, 8 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 11, 7 + note G#, 6 + note_type 12, 12, 7 + note A_, 4 + note B_, 8 + note G#, 8 + note_type 12, 11, 0 + note A_, 6 + note_type 12, 11, 7 + note A_, 6 + note_type 12, 12, 7 + note B_, 4 + octave 4 + note C_, 8 octave 3 - A_ 8 - notetype 12, 11, 0 - B_ 6 - notetype 12, 11, 7 - B_ 6 - notetype 12, 12, 7 - octave 4 - C_ 4 - notetype 12, 11, 0 - D_ 8 + note A_, 8 + note_type 12, 11, 0 + note B_, 6 + note_type 12, 11, 7 + note B_, 6 + note_type 12, 12, 7 + octave 4 + note C_, 4 + note_type 12, 11, 0 + note D_, 8 octave 3 - B_ 8 - notetype 12, 11, 0 - octave 4 - C# 16 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 11, 0 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note C#, 16 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 11, 0 octave 3 - A_ 16 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - G_ 6 - B_ 2 - octave 4 - D_ 8 + note A_, 16 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 2 - G_ 6 - F# 1 - F_ 1 - E_ 8 + note D_, 2 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 octave 3 - G_ 6 - F# 1 - F_ 1 - E_ 8 - C# 4 - D_ 4 - G_ 6 - B_ 2 - octave 4 - D_ 8 + 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 octave 3 - B_ 6 - octave 4 - D_ 2 - G_ 8 - notetype 12, 11, 0 - A_ 16 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 - notetype 12, 12, 1 - A_ 2 - A_ 4 - A_ 1 - A_ 1 - notetype 12, 12, 1 - A_ 8 - endchannel + note B_, 6 + octave 4 + note D_, 2 + note G_, 8 + note_type 12, 11, 0 + note A_, 16 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 + note_type 12, 12, 1 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note_type 12, 12, 1 + note A_, 8 + sound_ret Music_Credits_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 5 - C# 6 + note C#, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - C# 1 - D_ 6 + note C#, 1 + note D_, 6 octave 4 - B_ 1 + note B_, 1 octave 5 - D_ 1 - F# 6 - D_ 1 - F# 1 - A_ 4 - G# 2 - E_ 1 - G# 1 - A_ 1 + 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 rest 15 rest 16 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - octave 4 - 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 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffc1 - octave 4 - A_ 2 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call 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 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffc1 + octave 4 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 - octave 4 - 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 - G_ 4 - A_ 4 - B_ 4 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffc1 + sound_call Music_Credits_branch_7ffc1 + octave 4 + note G_, 4 + note A_, 4 + note B_, 4 octave 5 - D_ 4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffae - callchannel Music_Credits_branch_7ffa4 - 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 - 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 - 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 - 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 - callchannel Music_Credits_branch_7ffe4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffa4 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffb8 - callchannel Music_Credits_branch_7ffed - callchannel Music_Credits_branch_7ffed - A_ 1 + note D_, 4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffa4 + note E_, 4 + note A_, 2 + note E_, 4 + note A_, 2 + note E_, 2 + note A_, 2 + sound_call Music_Credits_branch_7ffae + sound_call Music_Credits_branch_7ffae + sound_call 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 + sound_call Music_Credits_branch_7ffd2 + sound_call Music_Credits_branch_7ffd2 + sound_call Music_Credits_branch_7ffdb + sound_call 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 + sound_call Music_Credits_branch_7ffb8 + sound_call 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 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffe4 + sound_call Music_Credits_branch_7ffe4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffa4 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffb8 + sound_call Music_Credits_branch_7ffed + sound_call Music_Credits_branch_7ffed + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 7 - endchannel + sound_ret Music_Credits_branch_7ffa4:: octave 4 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffae:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - endchannel + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_ret Music_Credits_branch_7ffb8:: - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - G_ 2 - B_ 2 - endchannel + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffc1:: octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_Credits_branch_7ffd2:: - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - D_ 2 - A_ 2 - endchannel + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + sound_ret Music_Credits_branch_7ffdb:: - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + sound_ret Music_Credits_branch_7ffe4:: - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - E_ 2 - B_ 2 - endchannel + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + sound_ret Music_Credits_branch_7ffed:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 - A_ 1 - A_ 1 + note A_, 1 + note A_, 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm index 7f0d046d..159bf42b 100644 --- a/audio/music/defeatedgymleader.asm +++ b/audio/music/defeatedgymleader.asm @@ -1,607 +1,607 @@ Music_DefeatedGymLeader_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 18, 3, 1 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 10, 6 + note_type 12, 10, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - D_ 1 - F# 6 - D_ 1 - F# 1 - notetype 12, 10, 0 - A_ 8 - notetype 12, 10, 7 - A_ 8 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 10, 7 + note A_, 8 Music_DefeatedGymLeader_branch_23ccc:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - 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 + 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 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 11, 2 + note B_, 8 + note_type 12, 11, 2 octave 3 - 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 + 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 + note_type 12, 11, 1 octave 2 - B_ 8 - notetype 12, 9, 7 + note B_, 8 + note_type 12, 9, 7 octave 3 - D_ 6 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 0 - F# 8 - E_ 8 - D_ 8 - C# 8 - notetype 12, 9, 7 - D_ 6 + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 0 + note F#, 8 + note E_, 8 + note D_, 8 + note C#, 8 + note_type 12, 9, 7 + note D_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - D_ 1 - F# 8 - notetype 12, 11, 0 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 9, 7 - E_ 6 - C# 1 - E_ 1 - G# 8 - notetype 12, 11, 0 - G# 6 - E_ 1 - G# 1 - B_ 8 - notetype 12, 9, 7 - C# 6 + note D_, 1 + note F#, 8 + note_type 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + note_type 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + note_type 12, 9, 7 + note C#, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - C# 1 - E_ 8 - notetype 12, 11, 0 - E_ 6 - C# 1 - E_ 1 - E_ 4 - G_ 4 - notetype 12, 9, 7 - F# 6 - E_ 1 - F# 1 - A_ 8 - notetype 12, 10, 7 - G_ 8 - E_ 8 - loopchannel 0, Music_DefeatedGymLeader_branch_23ccc + note C#, 1 + note E_, 8 + note_type 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + note_type 12, 9, 7 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + note_type 12, 10, 7 + note G_, 8 + note E_, 8 + sound_loop 0, Music_DefeatedGymLeader_branch_23ccc Music_DefeatedGymLeader_Ch2:: - duty 2 + duty_cycle 2 vibrato 24, 2, 4 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - A_ 6 - F# 1 - A_ 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 + note D_, 1 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 Music_DefeatedGymLeader_branch_23d84:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 4 - notetype 12, 12, 2 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 4 + note_type 12, 12, 2 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 6 - notetype 6, 12, 2 - G_ 1 - A_ 1 - B_ 1 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 6 + note_type 6, 12, 2 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 4 - A_ 4 - A_ 3 - notetype 6, 12, 2 - B_ 1 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 4 + note A_, 4 + note A_, 3 + note_type 6, 12, 2 + note B_, 1 octave 4 - C# 1 - notetype 12, 12, 2 - D_ 2 - C# 2 + note C#, 1 + note_type 12, 12, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 4 - B_ 2 - A_ 2 - G_ 2 - F# 2 - notetype 12, 12, 1 - D_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 1 + note D_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 8, 0 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 8, 0 octave 4 - E_ 8 - notetype 12, 10, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 + note E_, 8 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 6, 15 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 6, -7 octave 4 - C# 8 - notetype 12, 12, 7 - C# 8 - F# 4 - E_ 4 - notetype 12, 11, 0 - D_ 14 + note C#, 8 + note_type 12, 12, 7 + note C#, 8 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note D_, 14 octave 3 - B_ 2 - notetype 12, 10, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 12, 7 - A_ 6 - F# 1 - A_ 1 - notetype 12, 11, 0 + note B_, 2 + note_type 12, 10, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + note_type 12, 11, 0 octave 4 - D_ 8 - notetype 12, 10, 0 - D_ 8 - notetype 12, 9, 7 - D_ 8 - notetype 12, 12, 7 + note D_, 8 + note_type 12, 10, 0 + note D_, 8 + note_type 12, 9, 7 + note D_, 8 + note_type 12, 12, 7 octave 3 - B_ 6 - G# 1 - B_ 1 - notetype 12, 4, 15 + note B_, 6 + note G#, 1 + note B_, 1 + note_type 12, 4, -7 octave 4 - E_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 + note E_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 octave 3 - G_ 6 - E_ 1 - G_ 1 - notetype 12, 11, 0 + note G_, 6 + note E_, 1 + note G_, 1 + note_type 12, 11, 0 octave 4 - C# 8 - notetype 12, 11, 7 - C# 8 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 4 - notetype 12, 11, 0 - D_ 14 - E_ 2 - D_ 12 - notetype 12, 12, 2 + note C#, 4 + note_type 12, 11, 0 + note D_, 14 + note E_, 2 + note D_, 12 + note_type 12, 12, 2 octave 3 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + note C#, 1 + sound_loop 0, Music_DefeatedGymLeader_branch_23d84 Music_DefeatedGymLeader_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 vibrato 16, 1, 2 octave 4 - F# 6 - D_ 1 - F# 1 - A_ 6 - F# 1 - A_ 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 5 - D_ 6 + note D_, 6 octave 4 - A_ 1 + note A_, 1 octave 5 - D_ 1 - F# 8 + note D_, 1 + note F#, 8 Music_DefeatedGymLeader_branch_23e65:: octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F# 3 + note F#, 3 rest 1 - F# 3 + note F#, 3 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 5 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 3 + note G_, 3 rest 1 - D_ 3 + note D_, 3 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 7 - 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 + 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 + sound_loop 0, Music_DefeatedGymLeader_branch_23e65 diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm index 8ad51afa..158d755c 100644 --- a/audio/music/defeatedtrainer.asm +++ b/audio/music/defeatedtrainer.asm @@ -1,266 +1,266 @@ Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch tempo 224 - notetype 4, 10, 2 + note_type 4, 10, 2 octave 4 - D_ 2 + note D_, 2 tempo 224 - notetype 4, 10, 2 - D_ 2 - D_ 2 - D_ 2 + note_type 4, 10, 2 + note D_, 2 + note D_, 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 4, 11, 3 - F# 12 - duty 1 + note D_, 2 + note_type 4, 11, 3 + note F#, 12 + duty_cycle 1 tempo 224 Music_DefeatedTrainer_branch_23a76:: - notetype 4, 6, 3 + note_type 4, 6, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 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 + 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 octave 4 - C# 3 - D_ 3 - E_ 3 - F# 3 - C# 3 + note C#, 3 + note D_, 3 + note E_, 3 + note F#, 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 + note B_, 3 + note A_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - A_ 6 - F# 3 - A_ 3 - B_ 6 - G# 3 - B_ 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - C_ 3 - D_ 3 + note C_, 3 + note D_, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - D_ 6 - C# 3 + note D_, 6 + note C#, 3 octave 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 + 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 + sound_loop 0, Music_DefeatedTrainer_branch_23a76 Music_DefeatedTrainer_Ch2:: - duty 2 - notetype 4, 12, 3 + duty_cycle 2 + note_type 4, 12, 3 octave 4 - A_ 2 - notetype 4, 12, 3 - A_ 2 - A_ 2 - A_ 2 - B_ 2 + note A_, 2 + note_type 4, 12, 3 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 octave 5 - C# 2 - notetype 4, 12, 4 - D_ 12 + note C#, 2 + note_type 4, 12, 4 + note D_, 12 Music_DefeatedTrainer_branch_23ad2:: - notetype 4, 8, 5 + note_type 4, 8, 5 octave 4 - D_ 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - E_ 3 - F# 3 - G_ 6 - D_ 6 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note E_, 3 + note F#, 3 + note G_, 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F# 3 - G_ 3 - A_ 6 - F# 3 - G_ 3 - A_ 6 - D_ 6 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note G_, 3 + note A_, 6 + note D_, 6 octave 3 - A_ 3 + note A_, 3 octave 4 - D_ 3 - E_ 6 + note D_, 3 + note E_, 6 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - F_ 6 - C_ 3 - F_ 3 - G_ 3 - D_ 3 - G_ 6 - notetype 4, 7, 0 - F# 12 - notetype 4, 7, 7 - F# 12 - notetype 4, 6, 0 - E_ 12 - notetype 4, 6, 7 - E_ 12 - loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + note E_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note G_, 3 + note D_, 3 + note G_, 6 + note_type 4, 7, 0 + note F#, 12 + note_type 4, 7, 7 + note F#, 12 + note_type 4, 6, 0 + note E_, 12 + note_type 4, 6, 7 + note E_, 12 + sound_loop 0, Music_DefeatedTrainer_branch_23ad2 Music_DefeatedTrainer_Ch3:: - notetype 4, 1, 0 + note_type 4, 1, 0 octave 5 - D_ 2 - notetype 4, 1, 0 - D_ 2 - D_ 2 + note D_, 2 + note_type 4, 1, 0 + note D_, 2 + note D_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 - A_ 12 - notetype 4, 2, 1 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 12 + note_type 4, 2, 1 Music_DefeatedTrainer_branch_23b24:: - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - B_ 3 + note B_, 3 rest 3 - F# 3 + note F#, 3 rest 3 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 octave 5 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - F# 3 + note A_, 3 + note F#, 3 octave 5 - D_ 3 + note D_, 3 octave 4 - F# 3 + note F#, 3 rest 3 - G# 3 + note G#, 3 octave 5 - E_ 3 + note E_, 3 octave 4 - G# 3 + note G#, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - F_ 3 + note F_, 3 octave 4 - A_ 3 + note A_, 3 rest 3 - B_ 3 + note B_, 3 octave 5 - G_ 3 + note G_, 3 octave 4 - B_ 3 - A# 3 - A_ 3 + note B_, 3 + note A#, 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 rest 3 - A_ 3 + note A_, 3 octave 5 - C_ 3 - C# 3 + note C_, 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 rest 3 - C# 3 + note C#, 3 octave 4 - A_ 3 - loopchannel 0, Music_DefeatedTrainer_branch_23b24 + note A_, 3 + sound_loop 0, Music_DefeatedTrainer_branch_23b24 diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm index 92326a84..364f548e 100644 --- a/audio/music/defeatedwildmon.asm +++ b/audio/music/defeatedwildmon.asm @@ -1,302 +1,302 @@ Music_DefeatedWildMon_Ch1:: tempo 112 volume 7, 7 - executemusic - duty 3 + execute_music + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch + toggle_perfect_pitch tempo 112 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - E_ 12 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 12 Music_DefeatedWildMon_branch_23b8b:: - notetype 12, 6, 2 - 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 + note_type 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 + sound_loop 0, Music_DefeatedWildMon_branch_23b8b Music_DefeatedWildMon_Ch2:: - executemusic - duty 2 - notetype 12, 12, 3 + execute_music + duty_cycle 2 + note_type 12, 12, 3 octave 4 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 12, 12, 7 - B_ 12 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 12, 12, 7 + note B_, 12 Music_DefeatedWildMon_branch_23bce:: - notetype 12, 8, 2 + note_type 12, 8, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 octave 4 - C# 2 - C# 2 - C# 4 + note C#, 2 + note C#, 2 + note C#, 4 octave 3 - B_ 2 - B_ 2 - B_ 4 - B_ 2 - A_ 2 - G# 2 - A_ 2 - B_ 2 - B_ 2 - B_ 4 + 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 octave 4 - C# 2 - C# 2 - C# 4 + note C#, 2 + note C#, 2 + note C#, 4 octave 3 - B_ 8 + note B_, 8 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - A# 2 + note A#, 2 + note A_, 2 + note A#, 2 octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 2 - C_ 2 - C_ 4 - C_ 2 + 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 octave 3 - A# 2 - A_ 2 - A# 2 + note A#, 2 + note A_, 2 + note A#, 2 octave 4 - C_ 2 - C_ 2 - C_ 4 - D_ 2 - D_ 2 - D_ 4 - C_ 8 - loopchannel 0, Music_DefeatedWildMon_branch_23bce + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + sound_loop 0, Music_DefeatedWildMon_branch_23bce Music_DefeatedWildMon_Ch3:: - executemusic - notetype 12, 2, 0 + execute_music + note_type 12, 2, 0 octave 5 - E_ 1 + note E_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 Music_DefeatedWildMon_branch_23c21:: octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 octave 5 - D# 1 + note D#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 octave 5 - E_ 1 + note E_, 1 rest 3 octave 4 - D# 4 + note D#, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 1 octave 4 - F_ 1 + note F_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - G_ 1 + note G_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 3 octave 5 - F_ 1 + note F_, 1 rest 3 octave 4 - D# 4 - loopchannel 0, Music_DefeatedWildMon_branch_23c21 + note D#, 4 + sound_loop 0, Music_DefeatedWildMon_branch_23c21 diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm index 825207b8..6bcb1fc0 100644 --- a/audio/music/dungeon1.asm +++ b/audio/music/dungeon1.asm @@ -1,673 +1,675 @@ Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 - notetype 12, 4, 13 + note_type 12, 4, -5 rest 8 + ; stereo_panning %1110, %1101 octave 4 - F# 8 + note F#, 8 + ; stereo_panning %1111, %1111 Music_Dungeon1_branch_7dee5:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 Music_Dungeon1_branch_7dee8:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 3, Music_Dungeon1_branch_7dee8 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 3, Music_Dungeon1_branch_7dee8 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 - A_ 1 - A# 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 Music_Dungeon1_branch_7deff:: - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 4, Music_Dungeon1_branch_7deff - callchannel Music_Dungeon1_branch_7dfd5 - octave 3 - G_ 1 - F# 1 - E_ 1 - G_ 1 - callchannel Music_Dungeon1_branch_7dfd5 - octave 3 - A_ 1 - G_ 1 - E_ 1 - A_ 1 - callchannel Music_Dungeon1_branch_7dfd5 - octave 3 - B_ 1 - A_ 1 - G_ 1 - F# 1 - notetype 12, 12, 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfc5 - octave 3 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 3 - octave 3 - G_ 4 - F# 4 - E_ 4 - D# 4 - E_ 4 - D# 4 - C_ 4 + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 4, Music_Dungeon1_branch_7deff + sound_call Music_Dungeon1_branch_7dfd5 + octave 3 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + sound_call Music_Dungeon1_branch_7dfd5 + octave 3 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + sound_call Music_Dungeon1_branch_7dfd5 + octave 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note_type 12, 12, 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 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 octave 2 - B_ 4 - notetype 12, 12, 2 - B_ 1 - A# 1 - G_ 1 - A# 1 - B_ 1 - A# 1 - G_ 1 - A# 1 - octave 3 - C_ 1 + note B_, 4 + note_type 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 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - G# 1 - B_ 1 + note B_, 1 + note G#, 1 + note B_, 1 octave 3 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - C# 1 - C_ 1 + note C_, 1 + note C#, 1 + note C_, 1 octave 2 - A_ 1 + note A_, 1 octave 3 - C_ 1 - D_ 1 - C# 1 + note C_, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 - D_ 1 - C# 1 + note C#, 1 + note D_, 1 + note C#, 1 octave 2 - A# 1 + note A#, 1 octave 3 - C# 1 + note C#, 1 Music_Dungeon1_branch_7df6e:: rest 16 - loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, 12, 3 - callchannel Music_Dungeon1_branch_7dfbb - B_ 2 - G_ 2 + sound_loop 8, Music_Dungeon1_branch_7df6e + note_type 12, 12, 3 + sound_call Music_Dungeon1_branch_7dfbb + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - callchannel Music_Dungeon1_branch_7dfbb - 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 - B_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C_ 3 - callchannel Music_Dungeon1_branch_7dfc5 - C# 3 - notetype 12, 12, 7 - octave 3 - F# 8 - D# 8 - notetype 12, 12, 2 - callchannel Music_Dungeon1_branch_7dfaa - callchannel Music_Dungeon1_branch_7dfaa - loopchannel 0, Music_Dungeon1_branch_7dee5 + note G_, 2 + note A_, 4 + note F#, 2 + sound_call 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 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C_, 3 + sound_call Music_Dungeon1_branch_7dfc5 + note C#, 3 + note_type 12, 12, 7 + octave 3 + note F#, 8 + note D#, 8 + note_type 12, 12, 2 + sound_call Music_Dungeon1_branch_7dfaa + sound_call Music_Dungeon1_branch_7dfaa + sound_loop 0, Music_Dungeon1_branch_7dee5 Music_Dungeon1_branch_7dfaa:: - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - E_ 1 - D# 1 - B_ 1 - A# 1 - G_ 1 - G# 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 rest 1 - A# 1 - endchannel + note A#, 1 + sound_ret Music_Dungeon1_branch_7dfbb:: octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - endchannel + note G_, 2 + note A#, 2 + sound_ret Music_Dungeon1_branch_7dfc5:: octave 3 - E_ 1 - E_ 1 - F_ 1 - E_ 1 - G_ 1 - E_ 1 - A_ 1 - E_ 1 - A# 1 - E_ 1 - B_ 1 - E_ 1 + 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 octave 4 - C_ 1 - endchannel + note C_, 1 + sound_ret Music_Dungeon1_branch_7dfd5:: - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel + sound_ret Music_Dungeon1_Ch2:: vibrato 11, 1, 5 - duty 3 - notetype 12, 0, 15 + duty_cycle 3 + note_type 12, 0, -7 octave 4 - G# 8 - notetype 12, 4, 13 + note G#, 8 + note_type 12, 4, -5 octave 5 - D_ 8 + note D_, 8 Music_Dungeon1_branch_7dfeb:: - notetype 12, 12, 2 + note_type 12, 12, 2 Music_Dungeon1_branch_7dfed:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 3, Music_Dungeon1_branch_7dfed + sound_call Music_Dungeon1_branch_7e097 + sound_loop 3, Music_Dungeon1_branch_7dfed octave 2 - E_ 1 - E_ 1 - B_ 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - E_ 1 - E_ 1 - A_ 1 - G_ 1 - F_ 1 - F# 1 - G_ 1 - D# 1 + 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 Music_Dungeon1_branch_7e006:: - callchannel Music_Dungeon1_branch_7e097 - loopchannel 4, Music_Dungeon1_branch_7e006 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 4, Music_Dungeon1_branch_7e006 rest 2 - callchannel Music_Dungeon1_branch_7e0ab + sound_call Music_Dungeon1_branch_7e0ab octave 3 - C_ 4 - callchannel Music_Dungeon1_branch_7e0ab + note C_, 4 + sound_call Music_Dungeon1_branch_7e0ab octave 3 - C# 4 - callchannel Music_Dungeon1_branch_7e0ab + note C#, 4 + sound_call Music_Dungeon1_branch_7e0ab octave 3 - D# 4 - notetype 12, 13, 3 + note D#, 4 + note_type 12, 13, 3 octave 4 - E_ 4 - D# 4 - C_ 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 3 - B_ 4 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0b5 + note B_, 4 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - F# 4 - callchannel Music_Dungeon1_branch_7e0b5 + note F#, 4 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0b5 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0b5 octave 3 - A# 4 - notetype 12, 13, 3 + note A#, 4 + note_type 12, 13, 3 octave 4 - E_ 4 - D# 4 - C_ 4 + note E_, 4 + note D#, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 - octave 3 - B_ 4 - G_ 4 - F# 2 - notetype 12, 13, 6 - E_ 8 - F_ 8 - F# 8 - G_ 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0ba + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + note_type 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0ba rest 10 - E_ 1 + note E_, 1 rest 1 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 12 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 12 - callchannel Music_Dungeon1_branch_7e0ba + sound_call Music_Dungeon1_branch_7e0ba rest 14 - notetype 12, 13, 3 - callchannel Music_Dungeon1_branch_7e0cd - D# 4 - callchannel Music_Dungeon1_branch_7e0cd - D# 2 + note_type 12, 13, 3 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 4 + sound_call Music_Dungeon1_branch_7e0cd + note D#, 2 rest 2 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e0c0 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e0c0 rest 2 octave 3 - F# 4 + note F#, 4 octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 1 + note C_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 rest 2 octave 3 - G_ 4 - callchannel Music_Dungeon1_branch_7e0c0 + note G_, 4 + sound_call Music_Dungeon1_branch_7e0c0 octave 3 - A# 4 - notetype 12, 13, 6 - B_ 8 + note A#, 4 + note_type 12, 13, 6 + note B_, 8 octave 4 - D# 8 - notetype 12, 13, 2 - callchannel Music_Dungeon1_branch_7e097 - callchannel Music_Dungeon1_branch_7e097 - loopchannel 0, Music_Dungeon1_branch_7dfeb + note D#, 8 + note_type 12, 13, 2 + sound_call Music_Dungeon1_branch_7e097 + sound_call Music_Dungeon1_branch_7e097 + sound_loop 0, Music_Dungeon1_branch_7dfeb Music_Dungeon1_branch_7e097:: octave 2 - E_ 1 - E_ 1 - B_ 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - E_ 1 - E_ 1 - B_ 1 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 rest 2 - C_ 1 + note C_, 1 octave 2 - B_ 1 - endchannel + note B_, 1 + sound_ret Music_Dungeon1_branch_7e0ab:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - endchannel + sound_ret Music_Dungeon1_branch_7e0b5:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 10 - endchannel + sound_ret Music_Dungeon1_branch_7e0ba:: octave 1 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret Music_Dungeon1_branch_7e0c0:: octave 2 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 4 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - C# 1 - C_ 1 - endchannel + note C#, 1 + note C_, 1 + sound_ret Music_Dungeon1_branch_7e0cd:: octave 3 - E_ 6 - G_ 6 - E_ 4 - A_ 6 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 4 - G_ 6 - A# 6 - F# 4 - E_ 6 - F# 6 - endchannel + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + sound_ret Music_Dungeon1_Ch3:: - notetype 12, 1, 1 + note_type 12, 1, 1 vibrato 8, 2, 6 rest 14 octave 4 - D_ 1 - D# 1 + note D_, 1 + note D#, 1 Music_Dungeon1_branch_7e0e5:: - callchannel Music_Dungeon1_branch_7e140 - callchannel Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 + sound_call Music_Dungeon1_branch_7e140 octave 5 - E_ 2 + note E_, 2 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 octave 4 - F# 4 - callchannel Music_Dungeon1_branch_7e154 + note F#, 4 + sound_call Music_Dungeon1_branch_7e154 octave 4 - G_ 4 - callchannel Music_Dungeon1_branch_7e154 + note G_, 4 + sound_call Music_Dungeon1_branch_7e154 octave 4 - A_ 4 - B_ 4 - A# 4 - G_ 4 - F# 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 rest 6 - callchannel Music_Dungeon1_branch_7e177 - B_ 4 - A# 4 - G_ 4 - F# 4 - G_ 4 - F# 4 - E_ 4 - D# 4 - callchannel Music_Dungeon1_branch_7e15e + sound_call 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 + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 10 - E_ 1 + note E_, 1 rest 1 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 12 - callchannel Music_Dungeon1_branch_7e15e + sound_call Music_Dungeon1_branch_7e15e rest 10 - D_ 1 - D# 1 - callchannel Music_Dungeon1_branch_7e164 - callchannel Music_Dungeon1_branch_7e164 - E_ 2 + note D_, 1 + note D#, 1 + sound_call Music_Dungeon1_branch_7e164 + sound_call Music_Dungeon1_branch_7e164 + note E_, 2 rest 4 - callchannel Music_Dungeon1_branch_7e177 - B_ 8 - F# 6 - D_ 1 - D# 1 + sound_call Music_Dungeon1_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 rest 16 rest 16 - loopchannel 0, Music_Dungeon1_branch_7e0e5 + sound_loop 0, Music_Dungeon1_branch_7e0e5 Music_Dungeon1_branch_7e140:: octave 5 - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 6 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 5 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 4 - endchannel + 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 + sound_ret Music_Dungeon1_branch_7e154:: octave 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - endchannel + sound_ret Music_Dungeon1_branch_7e15e:: octave 3 - E_ 1 - G_ 1 - E_ 1 - D# 1 - endchannel + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + sound_ret Music_Dungeon1_branch_7e164:: - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 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 + 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 + sound_ret Music_Dungeon1_branch_7e177:: octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 4 + note F#, 4 rest 6 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - G_ 4 + note G_, 4 rest 6 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - A# 4 - endchannel + note E_, 1 + note E_, 1 + note A#, 4 + sound_ret Music_Dungeon1_Ch4:: - dspeed 12 + drum_speed 12 rest 14 - cymbal1 1 - cymbal1 1 + drum_note 12, 1 + drum_note 12, 1 Music_Dungeon1_branch_7e190:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e190 - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal1 2 - cymbal1 2 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e190 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 2 + drum_note 12, 2 Music_Dungeon1_branch_7e1a1:: - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 3, Music_Dungeon1_branch_7e1a1 - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal2 4 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 3, Music_Dungeon1_branch_7e1a1 + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 13, 4 Music_Dungeon1_branch_7e1b0:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1b0 - callchannel Music_Dungeon1_branch_7e202 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1b0 + sound_call Music_Dungeon1_branch_7e202 Music_Dungeon1_branch_7e1ba:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1ba - callchannel Music_Dungeon1_branch_7e202 - snare7 4 - snare8 4 - snare8 4 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1ba + sound_call Music_Dungeon1_branch_7e202 + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 rest 2 - snare7 2 - cymbal2 4 + drum_note 9, 2 + drum_note 13, 4 Music_Dungeon1_branch_7e1cf:: rest 16 - loopchannel 13, Music_Dungeon1_branch_7e1cf + sound_loop 13, Music_Dungeon1_branch_7e1cf rest 12 Music_Dungeon1_branch_7e1d5:: - callchannel Music_Dungeon1_branch_7e1fa - loopchannel 3, Music_Dungeon1_branch_7e1d5 - cymbal1 4 - cymbal1 4 - cymbal1 4 + sound_call Music_Dungeon1_branch_7e1fa + sound_loop 3, Music_Dungeon1_branch_7e1d5 + drum_note 12, 4 + drum_note 12, 4 + drum_note 12, 4 rest 2 - cymbal1 1 - cymbal1 1 - callchannel Music_Dungeon1_branch_7e1f1 - callchannel Music_Dungeon1_branch_7e1f1 - loopchannel 0, Music_Dungeon1_branch_7e190 + drum_note 12, 1 + drum_note 12, 1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_call Music_Dungeon1_branch_7e1f1 + sound_loop 0, Music_Dungeon1_branch_7e190 Music_Dungeon1_branch_7e1f1:: - cymbal2 4 - cymbal1 4 - cymbal2 4 - cymbal1 4 - endchannel + drum_note 13, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 + sound_ret Music_Dungeon1_branch_7e1fa:: - cymbal1 1 - cymbal1 1 + drum_note 12, 1 + drum_note 12, 1 rest 10 - cymbal3 4 - endchannel + drum_note 14, 4 + sound_ret Music_Dungeon1_branch_7e202:: - snare7 4 - snare8 4 - snare8 4 - snare9 4 - endchannel + drum_note 9, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 11, 4 + sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm index 44e9d5bf..2167bfd7 100644 --- a/audio/music/dungeon2.asm +++ b/audio/music/dungeon2.asm @@ -1,64 +1,64 @@ Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 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 + 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 octave 5 - C# 4 - C# 4 - C# 4 - C# 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 octave 3 - E_ 4 - E_ 4 - E_ 4 - E_ 4 - A# 4 - A# 4 - A# 4 - A# 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 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 4 - F# 2 - loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, 1, 15 + note G_, 2 + note A_, 4 + note F#, 2 + sound_loop 2, Music_Dungeon2_branch_7e892 + note_type 12, 1, -7 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 rest 16 rest 16 rest 16 @@ -67,251 +67,251 @@ Music_Dungeon2_branch_7e892:: rest 16 rest 16 rest 16 - loopchannel 0, Music_Dungeon2_branch_7e892 + sound_loop 0, Music_Dungeon2_branch_7e892 Music_Dungeon2_Ch2:: vibrato 11, 1, 5 Music_Dungeon2_branch_7e8db:: - duty 3 - notetype 12, 12, 2 + duty_cycle 3 + note_type 12, 12, 2 octave 3 - 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 + 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 octave 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 + 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 + sound_loop 2, Music_Dungeon2_branch_7e8db octave 3 - E_ 2 - G_ 2 - E_ 2 - D# 2 - E_ 2 - E_ 2 + note E_, 2 + note G_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note E_, 2 octave 5 - E_ 2 + note E_, 2 rest 2 - D# 2 + note D#, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - C# 2 - C_ 2 + note C#, 2 + note C_, 2 octave 4 - E_ 2 - G_ 2 + note E_, 2 + note G_, 2 octave 3 - A# 2 - C# 2 - A# 2 - A_ 2 - A# 2 - G_ 2 + note A#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 5 - G_ 2 + note G_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - F_ 2 + note F_, 2 rest 2 - E_ 2 - D# 2 - D_ 2 - C# 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 rest 16 rest 16 rest 16 rest 16 - notetype 12, 12, 7 - duty 1 + note_type 12, 12, 7 + duty_cycle 1 octave 4 - E_ 16 - D_ 16 - C_ 16 - D_ 16 - loopchannel 0, Music_Dungeon2_branch_7e8db + note E_, 16 + note D_, 16 + note C_, 16 + note D_, 16 + sound_loop 0, Music_Dungeon2_branch_7e8db Music_Dungeon2_Ch3:: - notetype 12, 1, 3 + note_type 12, 1, 3 vibrato 8, 2, 6 Music_Dungeon2_branch_7e940:: - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 16, Music_Dungeon2_branch_7e940 - E_ 4 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 16, Music_Dungeon2_branch_7e940 + note E_, 4 rest 4 rest 4 - E_ 4 - C_ 4 + note E_, 4 + note C_, 4 rest 4 rest 4 - C_ 4 - D_ 4 + note C_, 4 + note D_, 4 rest 4 rest 4 - D_ 4 + note D_, 4 octave 3 - A# 4 + note A#, 4 rest 4 rest 4 - A# 4 + note A#, 4 Music_Dungeon2_branch_7e958:: octave 5 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - A# 2 + note A#, 2 rest 2 octave 6 - D_ 2 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - A# 2 + note A#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - D# 2 + note D#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - loopchannel 3, Music_Dungeon2_branch_7e958 + sound_loop 3, Music_Dungeon2_branch_7e958 octave 4 - E_ 4 - B_ 4 - A# 4 + note E_, 4 + note B_, 4 + note A#, 4 octave 5 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 4 - G# 4 - G_ 4 - B_ 4 - A# 4 - E_ 4 - D# 4 - A_ 4 - G# 4 - E_ 4 - F# 4 - D# 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 octave 3 - E_ 16 - C_ 16 - D_ 16 + note E_, 16 + note C_, 16 + note D_, 16 octave 2 - A# 16 + note A#, 16 octave 3 - E_ 16 - F_ 16 - G_ 16 + note E_, 16 + note F_, 16 + note G_, 16 octave 3 - B_ 16 + note B_, 16 rest 16 rest 16 rest 16 rest 16 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - callchannel Music_Dungeon2_branch_7e9d1 - loopchannel 0, Music_Dungeon2_branch_7e940 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_call Music_Dungeon2_branch_7e9d1 + sound_loop 0, Music_Dungeon2_branch_7e940 octave 2 - G_ 2 - A# 4 - G_ 2 + note G_, 2 + note A#, 4 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A_ 2 - A# 2 - G_ 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - endchannel + sound_ret Music_Dungeon2_branch_7e9d1:: octave 4 - E_ 2 + note E_, 2 rest 4 octave 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 octave 4 - F# 4 - endchannel + note F#, 4 + sound_ret Music_Dungeon2_Ch4:: - dspeed 12 + drum_speed 12 Music_Dungeon2_branch_7e9dd:: - cymbal1 4 - cymbal2 4 - cymbal1 4 - snare8 4 - cymbal1 4 - cymbal2 4 - snare9 4 - snare7 4 - loopchannel 0, Music_Dungeon2_branch_7e9dd + drum_note 12, 4 + drum_note 13, 4 + drum_note 12, 4 + drum_note 10, 4 + drum_note 12, 4 + drum_note 13, 4 + drum_note 11, 4 + drum_note 9, 4 + sound_loop 0, Music_Dungeon2_branch_7e9dd diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm index 767ca626..81b2ead8 100644 --- a/audio/music/dungeon3.asm +++ b/audio/music/dungeon3.asm @@ -1,432 +1,432 @@ Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: - notetype 12, 12, 3 + note_type 12, 12, 3 Music_Dungeon3_branch_7e9fe:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 3, Music_Dungeon3_branch_7e9fe + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 3, Music_Dungeon3_branch_7e9fe octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 - D# 2 - E_ 2 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 Music_Dungeon3_branch_7ea11:: - callchannel Music_Dungeon3_branch_7eac1 - loopchannel 4, Music_Dungeon3_branch_7ea11 + sound_call Music_Dungeon3_branch_7eac1 + sound_loop 4, Music_Dungeon3_branch_7ea11 Music_Dungeon3_branch_7ea18:: - callchannel Music_Dungeon3_branch_7eab2 - loopchannel 4, Music_Dungeon3_branch_7ea18 + sound_call Music_Dungeon3_branch_7eab2 + sound_loop 4, Music_Dungeon3_branch_7ea18 octave 4 - F_ 2 - F_ 2 + note F_, 2 + note F_, 2 rest 2 - F_ 2 - E_ 2 - E_ 2 - D# 2 - D# 2 + note F_, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note D#, 2 rest 2 - D# 2 - D_ 2 - D_ 2 - callchannel Music_Dungeon3_branch_7eafc + note D#, 2 + note D_, 2 + note D_, 2 + sound_call Music_Dungeon3_branch_7eafc octave 4 - D_ 2 - D_ 2 + note D_, 2 + note D_, 2 rest 2 - D_ 2 - D# 2 - D# 2 - E_ 2 - E_ 2 + note D_, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note E_, 2 rest 2 - E_ 2 - F_ 2 - F_ 2 + note E_, 2 + note F_, 2 + note F_, 2 Music_Dungeon3_branch_7ea3c:: - callchannel Music_Dungeon3_branch_7eace - loopchannel 4, Music_Dungeon3_branch_7ea3c + sound_call Music_Dungeon3_branch_7eace + sound_loop 4, Music_Dungeon3_branch_7ea3c Music_Dungeon3_branch_7ea43:: - callchannel Music_Dungeon3_branch_7eadd - loopchannel 3, Music_Dungeon3_branch_7ea43 + sound_call Music_Dungeon3_branch_7eadd + sound_loop 3, Music_Dungeon3_branch_7ea43 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - F_ 2 - G# 2 - E_ 2 + note A_, 2 + note F_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - callchannel Music_Dungeon3_branch_7eaea - callchannel Music_Dungeon3_branch_7eaea + note C_, 2 + sound_call Music_Dungeon3_branch_7eaea + sound_call Music_Dungeon3_branch_7eaea octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note 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 - D# 2 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + sound_call Music_Dungeon3_branch_7eaf7 + note D#, 2 rest 16 rest 16 - loopchannel 0, Music_Dungeon3_branch_7e9fc + sound_loop 0, Music_Dungeon3_branch_7e9fc Music_Dungeon3_branch_7eab2:: octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - endchannel + note D#, 2 + sound_ret Music_Dungeon3_branch_7eac1:: - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 + note E_, 2 + note G#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - E_ 2 - G# 2 - endchannel + note E_, 2 + note G#, 2 + sound_ret Music_Dungeon3_branch_7eace:: octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D# 2 + note G_, 2 + note D#, 2 octave 2 - B_ 2 - endchannel + note B_, 2 + sound_ret Music_Dungeon3_branch_7eadd:: - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 + note A_, 2 + note F_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - A_ 2 - F_ 2 - endchannel + note A_, 2 + note F_, 2 + sound_ret Music_Dungeon3_branch_7eaea:: octave 3 - G# 2 - E_ 2 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G# 2 - E_ 2 + note G#, 2 + note E_, 2 octave 4 - C_ 2 - endchannel + note C_, 2 + sound_ret Music_Dungeon3_branch_7eaf7:: - D# 2 - G_ 2 - D# 2 - C# 6 - endchannel + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + sound_ret Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 176 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 184 octave 1 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 tempo 192 octave 1 - A_ 1 - A# 1 - B_ 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 tempo 200 octave 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 - D# 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 tempo 208 octave 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 - D_ 1 + note C_, 1 + note C#, 1 + note D_, 1 tempo 216 octave 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 tempo 224 octave 1 - F_ 1 - F# 1 - G_ 1 - G# 1 - A_ 1 - A# 1 - B_ 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 2 - C_ 1 + note C_, 1 tempo 160 - endchannel + sound_ret Music_Dungeon3_Ch2:: vibrato 11, 1, 5 - duty 3 + duty_cycle 3 Music_Dungeon3_branch_7eb6d:: - notetype 12, 13, 3 + note_type 12, 13, 3 octave 4 - D# 6 - C# 6 + note D#, 6 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 - A# 2 - B_ 6 + note B_, 2 + note A#, 2 + note B_, 6 octave 4 - C# 8 + note C#, 8 rest 2 - G# 6 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - 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 + 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 rest 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 rest 2 - G# 2 - A_ 2 - A_ 2 - A# 2 - A# 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A#, 2 + note A#, 2 rest 2 - A# 2 - B_ 2 - B_ 2 + note A#, 2 + note B_, 2 + note B_, 2 rest 8 rest 8 rest 8 @@ -436,179 +436,179 @@ Music_Dungeon3_branch_7eb6d:: rest 8 rest 8 octave 4 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 rest 2 - B_ 2 - A# 2 - A# 2 - A_ 2 - A_ 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A_, 2 + note A_, 2 rest 2 - A_ 2 - G# 2 - G# 2 - C# 8 + note A_, 2 + note G#, 2 + note G#, 2 + note C#, 8 rest 2 octave 3 - B_ 6 - A# 2 - B_ 2 + note B_, 6 + note A#, 2 + note B_, 2 octave 4 - D# 2 - G_ 2 - D# 2 - C# 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - G_ 2 - D# 2 - C# 6 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 6 - G_ 6 + note C#, 2 + note D#, 6 + note G_, 6 octave 3 - G_ 8 + note G_, 8 rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - G_ 6 - F_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 6 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 - G_ 6 - A_ 6 + note A_, 2 + note G_, 6 + note A_, 6 octave 4 - C# 6 - G_ 8 + note C#, 6 + note G_, 8 rest 2 - F_ 6 - E_ 2 - F_ 2 - A_ 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G_ 6 - A_ 2 + note A_, 2 + note G_, 6 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G_ 6 - A_ 6 + note A_, 2 + note G_, 6 + note A_, 6 octave 5 - C# 6 + note C#, 6 octave 4 - F# 8 + note F#, 8 rest 2 - E_ 6 - D# 2 - E_ 2 - G# 2 + note E_, 6 + note D#, 2 + note E_, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - E_ 2 - F# 2 - G# 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G# 2 - F# 6 - G# 6 + note G#, 2 + note F#, 6 + note G#, 6 octave 5 - C_ 6 - octave 3 - D# 2 - G_ 2 - D# 2 - C# 6 - D# 2 - G_ 2 - D# 2 - C# 6 + 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 octave 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 + 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 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 + note D#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - G_ 2 + note D#, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D# 2 - loopchannel 0, Music_Dungeon3_branch_7eb6d + note D#, 2 + sound_loop 0, Music_Dungeon3_branch_7eb6d Music_Dungeon3_Ch3:: - notetype 12, 1, 2 + note_type 12, 1, 2 rest 16 rest 16 rest 16 @@ -621,71 +621,71 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 12 - notetype 6, 1, 0 + note_type 6, 1, 0 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 rest 2 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 rest 16 rest 16 rest 10 octave 5 - E_ 8 + note E_, 8 octave 4 - B_ 8 + note B_, 8 octave 5 - D# 8 + note D#, 8 octave 4 - A# 8 + note A#, 8 octave 5 - D_ 8 + note D_, 8 octave 4 - A_ 8 + note A_, 8 octave 5 - C# 8 + note C#, 8 octave 4 - G# 8 + note G#, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - G_ 8 - B_ 8 - F# 8 - A# 8 - F_ 8 - A_ 8 - E_ 8 + note G_, 8 + note B_, 8 + note F#, 8 + note A#, 8 + note F_, 8 + note A_, 8 + note E_, 8 rest 16 rest 16 rest 8 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 rest 2 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 + note B_, 1 rest 10 rest 16 - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 rest 16 rest 16 @@ -707,11 +707,11 @@ Music_Dungeon3_Ch3:: rest 16 rest 16 rest 10 - loopchannel 0, Music_Dungeon3_Ch3 + sound_loop 0, Music_Dungeon3_Ch3 Music_Dungeon3_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 @@ -753,4 +753,4 @@ Music_Dungeon3_Ch4:: rest 16 rest 16 rest 10 - endchannel + sound_ret diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm index 9a13f00f..6dec6bbb 100644 --- a/audio/music/finalbattle.asm +++ b/audio/music/finalbattle.asm @@ -1,1344 +1,1344 @@ Music_FinalBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - F# 1 - F_ 1 - F# 1 - G_ 1 - F# 1 - G_ 1 - G# 1 - G_ 1 - notetype 12, 10, 2 - G# 1 - A_ 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - notetype 12, 9, 2 - A# 1 - B_ 1 - octave 4 - C_ 1 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note_type 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 + note_type 12, 9, 2 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 octave 3 - B_ 1 - octave 4 - C_ 1 - C# 1 - C_ 1 - C# 1 - notetype 12, 8, 2 - D_ 1 - C# 1 - D_ 1 - D# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - notetype 12, 12, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note_type 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 + note_type 12, 12, 1 octave 3 - 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 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 3 - E_ 4 - notetype 12, 12, 1 - F_ 1 - F_ 3 - notetype 12, 11, 3 - F_ 4 - notetype 12, 12, 1 - G_ 1 - G_ 3 - notetype 12, 11, 3 - G_ 4 - notetype 12, 12, 1 - G# 1 - G# 3 - notetype 12, 11, 7 - D# 4 + 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 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 3 + note E_, 4 + note_type 12, 12, 1 + note F_, 1 + note F_, 3 + note_type 12, 11, 3 + note F_, 4 + note_type 12, 12, 1 + note G_, 1 + note G_, 3 + note_type 12, 11, 3 + note G_, 4 + note_type 12, 12, 1 + note G#, 1 + note G#, 3 + note_type 12, 11, 7 + note D#, 4 Music_FinalBattle_branch_23429:: - notetype 12, 11, 7 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 4 - notetype 12, 11, 1 - F# 2 - F_ 1 - F# 1 - A_ 1 - F# 2 - F# 1 - notetype 12, 11, 7 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 12, 11, 1 + note F#, 2 + note F_, 1 + note F#, 1 + note A_, 1 + note F#, 2 + note F#, 1 + note_type 12, 11, 7 octave 2 - B_ 6 - notetype 12, 10, 0 + note B_, 6 + note_type 12, 10, 0 octave 3 - D_ 6 - notetype 12, 11, 7 - F# 4 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note D_, 6 + note_type 12, 11, 7 + note F#, 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - A# 4 - notetype 12, 5, 14 - B_ 12 - notetype 12, 11, 2 - 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 - E_ 1 - F# 1 - B_ 1 - F# 1 - notetype 12, 13, 2 - E_ 1 - F# 1 - B_ 1 - notetype 12, 12, 1 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 7 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - F_ 4 - notetype 12, 12, 1 - E_ 1 - E_ 3 - notetype 12, 11, 5 - D_ 4 - notetype 12, 12, 1 - E_ 1 - notetype 12, 11, 7 - E_ 7 - notetype 12, 12, 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 + note F#, 4 + note F_, 4 + note F#, 12 + note A#, 4 + note_type 12, 5, -6 + note B_, 12 + note_type 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 + note_type 12, 12, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note_type 12, 13, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note_type 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 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note F_, 4 + note_type 12, 12, 1 + note E_, 1 + note E_, 3 + note_type 12, 11, 5 + note D_, 4 + note_type 12, 12, 1 + note E_, 1 + note_type 12, 11, 7 + note E_, 7 + note_type 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 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - F_ 2 + note B_, 1 + note F_, 2 octave 4 - C_ 1 + note C_, 1 octave 3 - 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 + 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 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 1 + note C#, 1 + note C_, 1 octave 3 - F# 2 + note F#, 2 octave 4 - C# 1 - C_ 3 + note C#, 1 + note C_, 3 octave 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 - C_ 2 - notetype 12, 11, 0 - C# 8 - notetype 12, 11, 7 - C# 8 - notetype 12, 10, 0 + 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 + note_type 12, 11, 7 + octave 4 + note C_, 2 + note_type 12, 11, 0 + note C#, 8 + note_type 12, 11, 7 + note C#, 8 + note_type 12, 10, 0 octave 3 - F# 8 - F# 8 - notetype 12, 11, 0 + note F#, 8 + note F#, 8 + note_type 12, 11, 0 octave 3 - A_ 8 - notetype 12, 11, 7 - A_ 8 - G_ 4 - B_ 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - A_ 8 - notetype 12, 11, 0 - E_ 8 - notetype 12, 11, 7 - E_ 8 - notetype 12, 11, 0 - A# 8 - notetype 12, 11, 7 - A# 8 - octave 4 - F_ 8 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note G_, 4 + note B_, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + note A_, 8 + note_type 12, 11, 0 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + note_type 12, 11, 0 + note A#, 8 + note_type 12, 11, 7 + note A#, 8 + octave 4 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C# 4 - E_ 12 + note C#, 4 + note E_, 12 octave 3 - A_ 4 + note A_, 4 octave 4 - C# 12 - notetype 12, 4, 0 - callchannel Music_FinalBattle_branch_23710 - callchannel Music_FinalBattle_branch_23710 - notetype 12, 11, 7 + note C#, 12 + note_type 12, 4, 0 + sound_call Music_FinalBattle_branch_23710 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 7 octave 3 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - G_ 8 - notetype 12, 11, 7 - E_ 4 - B_ 4 - D# 4 - A# 4 - D_ 4 - A_ 4 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note G_, 8 + note_type 12, 11, 7 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - F# 4 - F_ 4 - F# 12 - notetype 12, 11, 0 - A_ 8 - notetype 12, 11, 7 - octave 4 - C_ 8 - notetype 12, 11, 0 + note F#, 4 + note F_, 4 + note F#, 12 + note_type 12, 11, 0 + note A_, 8 + note_type 12, 11, 7 + octave 4 + note C_, 8 + note_type 12, 11, 0 octave 3 - B_ 8 - notetype 12, 11, 7 - B_ 8 - notetype 12, 11, 0 - octave 4 - E_ 8 - notetype 12, 11, 7 - E_ 8 - loopchannel 0, Music_FinalBattle_branch_23429 + note B_, 8 + note_type 12, 11, 7 + note B_, 8 + note_type 12, 11, 0 + octave 4 + note E_, 8 + note_type 12, 11, 7 + note E_, 8 + sound_loop 0, Music_FinalBattle_branch_23429 Music_FinalBattle_Ch2:: - duty 3 + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 5 - C_ 1 + note C_, 1 octave 4 - G# 1 - B_ 1 - F# 1 - A_ 1 - E_ 1 - G_ 1 + note G#, 1 + note B_, 1 + note F#, 1 + note A_, 1 + note E_, 1 + note G_, 1 octave 5 - C_ 1 + note C_, 1 octave 4 - F_ 1 - C# 1 - E_ 1 - C_ 1 - D# 1 + note F_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note D#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - D_ 1 + note D_, 1 octave 5 - C_ 1 + note C_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - G# 1 - B_ 1 - F# 1 - A# 1 - F_ 1 - A_ 1 - octave 5 - C_ 1 + note G#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 octave 3 - G# 1 - D# 1 - G_ 1 - D_ 1 - F_ 1 - C# 1 - E_ 1 - octave 5 - C_ 1 - notetype 12, 12, 1 - octave 4 - 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 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - octave 5 - E_ 4 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 2 - D# 4 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - callchannel Music_FinalBattle_branch_23704 - notetype 12, 12, 1 - octave 4 - E_ 1 - E_ 3 - notetype 12, 4, 10 + 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 + note_type 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 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + octave 5 + note E_, 4 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 2 + note D#, 4 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + sound_call Music_FinalBattle_branch_23704 + note_type 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + note_type 12, 4, -2 octave 3 - G# 4 + note G#, 4 Music_FinalBattle_branch_235e6:: - notetype 12, 13, 7 + note_type 12, 13, 7 octave 4 - E_ 8 - D# 8 - D_ 8 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - notetype 12, 11, 1 - F_ 2 - F# 3 - A_ 1 - B_ 1 - A_ 1 - octave 4 - C_ 1 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + note_type 12, 11, 1 + note F_, 2 + note F#, 3 + note A_, 1 + note B_, 1 + note A_, 1 + octave 4 + note C_, 1 octave 3 - B_ 2 - A_ 1 - B_ 1 - B_ 1 - A_ 1 - A# 1 - notetype 12, 13, 7 - octave 4 - E_ 8 - D# 8 - D_ 8 + note B_, 2 + note A_, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note A#, 1 + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - notetype 12, 13, 7 - A# 4 - B_ 12 - octave 4 - D# 4 - E_ 12 - notetype 12, 10, 0 + note B_, 8 + note_type 12, 13, 7 + note A#, 4 + note B_, 12 + octave 4 + note D#, 4 + note E_, 12 + note_type 12, 10, 0 octave 3 - B_ 8 - octave 4 - D_ 8 - F_ 8 - D_ 8 - notetype 12, 13, 1 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note B_, 8 + octave 4 + note D_, 8 + note F_, 8 + note D_, 8 + note_type 12, 13, 1 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - D_ 4 - notetype 12, 13, 1 + note D_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - F_ 4 - notetype 12, 13, 1 + note F_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 3 - notetype 12, 12, 4 + note E_, 1 + note E_, 3 + note_type 12, 12, 4 octave 3 - D_ 4 - notetype 12, 13, 1 + note D_, 4 + note_type 12, 13, 1 octave 4 - E_ 1 - E_ 1 - notetype 12, 12, 4 + note E_, 1 + note E_, 1 + note_type 12, 12, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - D_ 2 - notetype 12, 12, 2 - octave 4 - 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 + note D_, 2 + note_type 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 + note_type 12, 12, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - D_ 2 - notetype 12, 13, 7 + note D_, 2 + note_type 12, 13, 7 octave 4 - E_ 4 - F_ 2 - F# 12 - notetype 12, 12, 2 + note E_, 4 + note F_, 2 + note F#, 12 + note_type 12, 12, 2 octave 3 - B_ 2 - B_ 4 - B_ 2 - B_ 4 - B_ 2 - notetype 12, 13, 7 - octave 4 - F_ 4 - F# 2 - G_ 12 - notetype 12, 12, 2 - C_ 2 - C_ 4 - C_ 2 - C_ 4 - C_ 2 - notetype 12, 13, 7 - F# 4 - G_ 2 - G# 12 - notetype 12, 8, 2 - C# 2 - C# 4 - notetype 12, 10, 2 - C# 2 - C# 4 - C# 4 - notetype 12, 13, 2 - C# 2 - C# 4 - notetype 12, 15, 2 - C# 2 - C# 4 - notetype 12, 12, 4 - E_ 1 - F_ 1 - notetype 12, 12, 0 - F# 12 - notetype 12, 12, 7 - F# 4 - notetype 12, 1, 15 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 4 + note B_, 2 + note_type 12, 13, 7 + octave 4 + note F_, 4 + note F#, 2 + note G_, 12 + note_type 12, 12, 2 + note C_, 2 + note C_, 4 + note C_, 2 + note C_, 4 + note C_, 2 + note_type 12, 13, 7 + note F#, 4 + note G_, 2 + note G#, 12 + note_type 12, 8, 2 + note C#, 2 + note C#, 4 + note_type 12, 10, 2 + note C#, 2 + note C#, 4 + note C#, 4 + note_type 12, 13, 2 + note C#, 2 + note C#, 4 + note_type 12, 15, 2 + note C#, 2 + note C#, 4 + note_type 12, 12, 4 + note E_, 1 + note F_, 1 + note_type 12, 12, 0 + note F#, 12 + note_type 12, 12, 7 + note F#, 4 + note_type 12, 1, -7 octave 3 - F# 8 - notetype 12, 9, 0 - F# 8 - notetype 12, 12, 7 - octave 4 - C# 4 - notetype 12, 12, 0 - D_ 12 - D_ 8 - notetype 12, 12, 7 - D_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - notetype 12, 12, 0 + note F#, 8 + note_type 12, 9, 0 + note F#, 8 + note_type 12, 12, 7 + octave 4 + note C#, 4 + note_type 12, 12, 0 + note D_, 12 + note D_, 8 + note_type 12, 12, 7 + note D_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note_type 12, 12, 0 octave 3 - A_ 8 - notetype 12, 12, 7 - A_ 8 - notetype 12, 12, 0 - octave 4 - F_ 8 - notetype 12, 12, 7 - F_ 8 - octave 5 - C_ 8 - octave 4 - A# 8 - notetype 12, 12, 0 - A_ 16 - A_ 8 - notetype 12, 12, 7 - 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 - E_ 8 - D# 8 - D_ 8 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 0 + octave 4 + note F_, 8 + note_type 12, 12, 7 + note F_, 8 + octave 5 + note C_, 8 + octave 4 + note A#, 8 + note_type 12, 12, 0 + note A_, 16 + note A_, 8 + note_type 12, 12, 7 + note A_, 8 + note_type 12, 12, 5 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 11, 1 + sound_call Music_FinalBattle_branch_23710 + note_type 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 12, 7 - octave 4 - D_ 8 - notetype 12, 4, 12 - C_ 8 - notetype 12, 13, 7 - E_ 8 - D# 8 - D_ 8 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 12, 7 + octave 4 + note D_, 8 + note_type 12, 4, -4 + note C_, 8 + note_type 12, 13, 7 + note E_, 8 + note D#, 8 + note D_, 8 octave 3 - B_ 8 - A# 4 - B_ 12 - notetype 12, 5, 13 - octave 4 - D_ 8 - notetype 12, 12, 0 - F_ 8 - notetype 12, 12, 0 - E_ 8 - notetype 12, 12, 7 - E_ 8 - A# 4 - B_ 12 - loopchannel 0, Music_FinalBattle_branch_235e6 + note B_, 8 + note A#, 4 + note B_, 12 + note_type 12, 5, -5 + octave 4 + note D_, 8 + note_type 12, 12, 0 + note F_, 8 + note_type 12, 12, 0 + note E_, 8 + note_type 12, 12, 7 + note E_, 8 + note A#, 4 + note B_, 12 + sound_loop 0, Music_FinalBattle_branch_235e6 Music_FinalBattle_branch_23704:: octave 4 - E_ 1 - E_ 1 - G_ 1 + note E_, 1 + note E_, 1 + note G_, 1 octave 5 - C_ 1 - E_ 1 - C_ 1 + note C_, 1 + note E_, 1 + note C_, 1 octave 4 - G_ 1 - F_ 1 - endchannel + note G_, 1 + note F_, 1 + sound_ret Music_FinalBattle_branch_23710:: octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - C# 2 - F# 2 - D_ 2 - endchannel + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + note F#, 2 + note D_, 2 + sound_ret Music_FinalBattle_Ch3:: - notetype 12, 1, 1 + note_type 12, 1, 1 octave 4 - E_ 4 + note E_, 4 octave 5 - E_ 4 + note E_, 4 octave 4 - F_ 4 + note F_, 4 octave 5 - D# 4 + note D#, 4 octave 4 - G_ 4 + note G_, 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G# 4 - B_ 4 - E_ 1 - E_ 1 + note G#, 4 + note B_, 4 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 6 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D# 4 - E_ 1 - E_ 1 + note D#, 4 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 + note C_, 4 octave 4 - A# 2 - E_ 1 - E_ 1 + note A#, 2 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 octave 5 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - B_ 4 - E_ 1 - E_ 1 + note B_, 4 + note E_, 1 + note E_, 1 rest 2 octave 5 - C_ 4 + note C_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 octave 5 - D_ 4 + note D_, 4 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - E_ 1 - D# 1 - E_ 1 - G_ 1 + note E_, 1 + note D#, 1 + note E_, 1 + note G_, 1 Music_FinalBattle_branch_2377d:: octave 4 - E_ 1 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 - E_ 1 + note F#, 2 + note E_, 1 octave 3 - E_ 1 + note E_, 1 rest 2 octave 4 - F# 4 - D# 1 + note F#, 4 + note D#, 1 octave 3 - D# 1 + note D#, 1 rest 2 octave 4 - F_ 4 - D_ 1 + note F_, 4 + note D_, 1 octave 3 - D_ 1 + note D_, 1 rest 2 octave 4 - E_ 4 - F# 1 + note E_, 4 + note F#, 1 octave 3 - F# 1 + note F#, 1 rest 2 octave 4 - F# 4 - F_ 4 + note F#, 4 + note F_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - 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 + 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 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 rest 2 - F_ 4 - E_ 1 - E_ 1 + note F_, 4 + note E_, 1 + note E_, 1 rest 2 - D_ 4 - E_ 1 - E_ 1 + note D_, 4 + note E_, 1 + note E_, 1 octave 3 - B_ 6 + note B_, 6 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 + note E_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - E_ 2 - B_ 2 - B_ 2 - E_ 2 - B_ 2 - B_ 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - B_ 2 - F_ 2 + note B_, 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - D# 2 + note D#, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 + note C_, 2 + note C_, 2 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 2 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - C# 2 - E_ 2 - C# 2 - callchannel Music_FinalBattle_branch_2395b - callchannel Music_FinalBattle_branch_2395b + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + sound_call Music_FinalBattle_branch_2395b + sound_call Music_FinalBattle_branch_2395b octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 1 - F# 1 - G_ 1 - G# 1 - callchannel Music_FinalBattle_branch_2396c - callchannel Music_FinalBattle_branch_2396c + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + sound_call Music_FinalBattle_branch_2396c + sound_call Music_FinalBattle_branch_2396c octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 + note F_, 2 octave 4 - A# 2 + note A#, 2 octave 5 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C# 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 4 - A# 2 - A_ 2 + note A#, 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - C# 2 + note C#, 2 octave 4 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - 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 + 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 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - F# 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 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 + 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 + sound_loop 0, Music_FinalBattle_branch_2377d Music_FinalBattle_branch_2395b:: octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 + note C#, 2 octave 4 - F# 2 + note F#, 2 octave 5 - C# 2 - endchannel + note C#, 2 + sound_ret Music_FinalBattle_branch_2396c:: octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 + note E_, 2 octave 4 - A_ 2 + note A_, 2 octave 5 - E_ 2 - endchannel + note E_, 2 + sound_ret diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 52b85e08..f152d180 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,627 +1,627 @@ Music_GameCorner_Ch1:: tempo 120 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 - octave 3 - A_ 6 - notetype 12, 11, 1 - G# 2 - F# 2 - E_ 2 - D# 2 - C# 2 - D# 16 + toggle_perfect_pitch + note_type 12, 11, 5 + octave 3 + note A_, 6 + note_type 12, 11, 1 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 Music_GameCorner_branch_7e222:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 4 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 - octave 3 - A_ 2 - G# 8 - notetype 12, 10, 7 - G# 2 - A_ 2 - B_ 2 - notetype 12, 11, 5 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - notetype 12, 10, 7 - F# 8 - D# 8 - notetype 12, 11, 5 - D# 4 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + note_type 12, 10, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note_type 12, 11, 5 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note_type 12, 10, 7 + note F#, 8 + note D#, 8 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 - octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 - octave 4 - 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 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 5 - C# 4 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 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 + note_type 12, 9, 7 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 5 + note C#, 4 octave 2 - G# 4 + note G#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - B_ 4 - octave 3 - A_ 2 - G# 8 - notetype 12, 11, 7 - G# 2 - A_ 2 - B_ 2 - G# 6 - E_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 - F# 8 - notetype 12, 9, 7 - D# 4 - C# 4 - notetype 12, 11, 5 - D# 4 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + note_type 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 + note_type 12, 9, 7 + note D#, 4 + note C#, 4 + note_type 12, 11, 5 + note D#, 4 octave 2 - B_ 4 - octave 3 - F# 4 - D# 4 - B_ 2 - A_ 8 - notetype 12, 11, 7 - F# 2 - G# 2 - A_ 2 - B_ 4 - A_ 4 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 2 - E_ 4 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + note_type 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 + note_type 12, 12, 2 + note E_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - E_ 2 - E_ 4 - E_ 4 - notetype 12, 11, 7 + note E_, 2 + note E_, 4 + note E_, 4 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 - octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 - octave 4 - D# 4 - octave 3 - B_ 4 - F# 4 - D# 4 - notetype 12, 11, 7 - E_ 3 - D# 1 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 10 - notetype 12, 11, 7 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note D#, 4 + note_type 12, 11, 7 + note E_, 3 + note D#, 1 + note_type 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 10 + note_type 12, 11, 7 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - D_ 2 - D# 10 + note C#, 2 + note D_, 2 + note D#, 10 octave 2 - B_ 2 - octave 3 - C# 2 - D# 2 - E_ 8 - notetype 12, 11, 5 - octave 4 - D# 4 - octave 3 - B_ 4 - F# 4 - A_ 4 - notetype 12, 11, 7 - G# 2 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 1 - G_ 1 - G# 8 - loopchannel 0, Music_GameCorner_branch_7e222 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + note_type 12, 11, 5 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note A_, 4 + note_type 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 + sound_loop 0, Music_GameCorner_branch_7e222 Music_GameCorner_Ch2:: - duty 2 + duty_cycle 2 vibrato 10, 2, 3 - notetype 12, 12, 6 - octave 4 - C# 6 - notetype 12, 12, 1 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - duty 3 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - A# 1 - B_ 8 + note_type 12, 12, 6 + octave 4 + note C#, 6 + note_type 12, 12, 1 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + duty_cycle 3 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 8 Music_GameCorner_branch_7e2fa:: - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - E_ 4 + note E_, 4 octave 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 - C# 2 - octave 3 - B_ 2 - A# 2 - B_ 16 - E_ 4 + 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 octave 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 - E_ 2 - notetype 12, 10, 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 1 - D# 1 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - D# 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - notetype 12, 12, 5 - F# 4 - D# 4 - octave 3 - B_ 4 - octave 4 - A_ 4 - G# 3 - A_ 1 - notetype 12, 12, 2 - G# 2 - F# 2 - E_ 2 - notetype 12, 12, 7 - octave 3 - B_ 2 - octave 4 - C# 2 - D_ 2 - D# 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - E_ 10 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - F# 4 - D# 4 - A_ 4 - F# 4 - B_ 16 - loopchannel 0, Music_GameCorner_branch_7e2fa + 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 + note_type 12, 12, 1 + note E_, 2 + note_type 12, 10, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 2 + note_type 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note_type 12, 12, 5 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note A_, 4 + note G#, 3 + note A_, 1 + note_type 12, 12, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note_type 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note 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 + sound_loop 0, Music_GameCorner_branch_7e2fa Music_GameCorner_Ch3:: - notetype 12, 1, 3 + note_type 12, 1, 3 octave 5 - C# 1 + note C#, 1 rest 5 octave 4 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - B_ 1 + note B_, 1 rest 9 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 Music_GameCorner_branch_7e3a5:: - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - D# 1 + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e42d + sound_call Music_GameCorner_branch_7e442 + sound_call Music_GameCorner_branch_7e457 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e481 + sound_call Music_GameCorner_branch_7e496 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e42d - callchannel Music_GameCorner_branch_7e442 - callchannel Music_GameCorner_branch_7e457 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e481 - callchannel Music_GameCorner_branch_7e496 - E_ 1 + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e42d + sound_call Music_GameCorner_branch_7e442 + sound_call Music_GameCorner_branch_7e457 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e481 + sound_call Music_GameCorner_branch_7e496 + note E_, 1 rest 3 octave 3 - B_ 1 + note B_, 1 rest 3 octave 4 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - E_ 1 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - callchannel Music_GameCorner_branch_7e46c - callchannel Music_GameCorner_branch_7e418 - callchannel Music_GameCorner_branch_7e4ab - callchannel Music_GameCorner_branch_7e42d - loopchannel 0, Music_GameCorner_branch_7e3a5 + sound_call Music_GameCorner_branch_7e46c + sound_call Music_GameCorner_branch_7e418 + sound_call Music_GameCorner_branch_7e4ab + sound_call Music_GameCorner_branch_7e42d + sound_loop 0, Music_GameCorner_branch_7e3a5 Music_GameCorner_branch_7e418:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e42d:: - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e442:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e457:: - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e46c:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e481:: - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e496:: - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - endchannel + sound_ret Music_GameCorner_branch_7e4ab:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm index b314336d..1ffc4930 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,357 +1,357 @@ Music_Gym_Ch1:: tempo 138 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 2, 2 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - G_ 6 - C_ 1 - G_ 1 - F_ 6 + note G_, 6 + note C_, 1 + note G_, 1 + note F_, 6 octave 2 - A# 1 + note A#, 1 octave 3 - F_ 1 - E_ 6 + note F_, 1 + note E_, 6 octave 2 - A_ 1 + note A_, 1 octave 3 - E_ 1 - F_ 4 - G_ 4 + note E_, 1 + note F_, 4 + note G_, 4 Music_Gym_branch_bcd8:: - E_ 4 - F_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - notetype 12, 11, 1 - D_ 3 - notetype 12, 11, 5 - 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 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note_type 12, 11, 1 + note D_, 3 + note_type 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 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - notetype 12, 11, 1 - A# 3 - notetype 12, 11, 5 - F_ 1 - F_ 4 - E_ 2 - D_ 2 - E_ 2 - F_ 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note_type 12, 11, 1 + note A#, 3 + note_type 12, 11, 5 + note F_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - F_ 2 - D_ 2 - D_ 1 - E_ 1 - F_ 4 - A# 2 - F_ 1 - A# 1 + 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 octave 4 - D_ 4 + note D_, 4 octave 3 - 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 + 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 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_Gym_branch_bcd8 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_Gym_branch_bcd8 Music_Gym_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 + note C_, 1 octave 3 - A# 6 - F_ 1 - A# 1 - notetype 12, 10, 0 - A_ 12 - notetype 12, 12, 7 - B_ 4 + note A#, 6 + note F_, 1 + note A#, 1 + note_type 12, 10, 0 + note A_, 12 + note_type 12, 12, 7 + note B_, 4 Music_Gym_branch_bd82:: octave 4 - C_ 12 + note C_, 12 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - notetype 12, 12, 2 - D_ 3 + note C_, 2 + note_type 12, 12, 2 + note D_, 3 octave 3 - A# 1 - notetype 12, 12, 7 - A# 12 + note A#, 1 + note_type 12, 12, 7 + note A#, 12 octave 4 - C_ 12 + note C_, 12 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - notetype 12, 12, 4 + note C_, 2 + note_type 12, 12, 4 octave 3 - A# 2 - notetype 12, 12, 7 - A# 1 + note A#, 2 + note_type 12, 12, 7 + note A#, 1 octave 4 - C_ 1 - D_ 12 - E_ 12 - D_ 2 - E_ 2 - notetype 12, 12, 2 - F_ 3 - D_ 1 - notetype 12, 12, 7 - D_ 4 - notetype 12, 12, 2 - A# 3 - F_ 1 - notetype 12, 12, 7 - F_ 4 - E_ 12 - D_ 2 - E_ 2 - F_ 2 - D_ 1 - F_ 1 - A# 12 + note C_, 1 + note D_, 12 + note E_, 12 + note D_, 2 + note E_, 2 + note_type 12, 12, 2 + note F_, 3 + note D_, 1 + note_type 12, 12, 7 + note D_, 4 + note_type 12, 12, 2 + note A#, 3 + note F_, 1 + note_type 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 octave 3 - G_ 6 + note G_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 6 - G_ 2 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 6 + note G_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - A# 4 - A_ 4 - G_ 4 - C_ 2 - D_ 2 - G_ 6 + note G_, 2 + note A#, 4 + note A_, 4 + note G_, 4 + note C_, 2 + note D_, 2 + note G_, 6 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 4 - A# 4 - A_ 4 - G_ 4 - F_ 4 - notetype 12, 12, 3 - E_ 2 - notetype 12, 12, 7 - E_ 1 - F_ 1 - G_ 4 - notetype 12, 12, 3 - G_ 2 - notetype 12, 12, 7 - G_ 1 - A_ 1 - A# 4 - notetype 12, 12, 4 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note_type 12, 12, 3 + note E_, 2 + note_type 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 4 + note_type 12, 12, 3 + note G_, 2 + note_type 12, 12, 7 + note G_, 1 + note A_, 1 + note A#, 4 + note_type 12, 12, 4 octave 4 - C_ 2 - notetype 12, 12, 7 - C_ 1 - D_ 1 - E_ 12 - loopchannel 0, Music_Gym_branch_bd82 + note C_, 2 + note_type 12, 12, 7 + note C_, 1 + note D_, 1 + note E_, 12 + sound_loop 0, Music_Gym_branch_bd82 Music_Gym_Ch3:: - notetype 12, 1, 1 + note_type 12, 1, 1 rest 16 rest 10 octave 4 - G_ 2 - F_ 2 - D_ 2 + note G_, 2 + note F_, 2 + note D_, 2 Music_Gym_branch_be02:: - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be44 - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - callchannel Music_Gym_branch_be4d - callchannel Music_Gym_branch_be3b - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - A_ 2 - F_ 2 - loopchannel 0, Music_Gym_branch_be02 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be44 + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call Music_Gym_branch_be3b + sound_call Music_Gym_branch_be4d + sound_call 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 + sound_loop 0, Music_Gym_branch_be02 Music_Gym_branch_be3b:: - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - E_ 2 - G_ 2 - endchannel + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + sound_ret Music_Gym_branch_be44:: - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - D_ 2 - F_ 2 - endchannel + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + sound_ret Music_Gym_branch_be4d:: - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - F_ 2 - A# 2 - endchannel + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + sound_ret diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm index 1eb2951d..5befd665 100644 --- a/audio/music/gymleaderbattle.asm +++ b/audio/music/gymleaderbattle.asm @@ -1,1400 +1,1400 @@ Music_GymLeaderBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 6 octave 3 - 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 + 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 octave 1 - G# 1 - A_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 - A# 1 - B_ 1 - octave 2 - F# 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 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - F_ 6 - F# 1 + note F_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - G_ 6 - F# 1 + note G_, 6 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 9 - A_ 6 + note A_, 6 Music_GymLeaderBattle_branch_223b0:: - 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 + 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 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 - F# 1 + note B_, 1 + note A_, 1 + note 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 + 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 - E_ 1 - A_ 1 + note E_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 octave 3 - C# 1 + note C#, 1 octave 2 - B_ 1 - A_ 1 + note B_, 1 + note A_, 1 rest 2 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - E_ 4 + note E_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - D_ 4 + note D_, 4 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 2 - C# 2 + note C#, 2 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 rest 16 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A_ 1 - B_ 1 + note B_, 1 + note A_, 1 + note B_, 1 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - C# 12 - notetype 12, 11, 3 + note C#, 12 + note_type 12, 11, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - A_ 12 - notetype 12, 11, 3 - D# 4 - C# 4 - D# 4 - E_ 2 - F# 4 + note A_, 12 + note_type 12, 11, 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - F# 2 - B_ 2 - F# 2 - D# 2 - F# 2 + note C#, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note F#, 2 octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 11, 5 - octave 3 - A_ 12 - notetype 12, 11, 3 - 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 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - E_ 2 - D# 4 - C# 6 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 11, 5 + octave 3 + note A_, 12 + note_type 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 + note_type 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 rest 16 rest 10 - 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 + 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 + sound_loop 0, Music_GymLeaderBattle_branch_223b0 Music_GymLeaderBattle_Ch2:: - duty 3 + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 3 - octave 4 - 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 + note_type 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 rest 5 - 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 + 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 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 - A# 6 + note A#, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 15 - B_ 1 + note B_, 1 rest 9 octave 4 - C# 6 + note C#, 6 Music_GymLeaderBattle_branch_225e0:: - notetype 12, 12, 5 - 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 - A_ 8 - octave 4 - C# 8 - E_ 8 - C# 8 - notetype 12, 12, 5 - duty 3 - 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 - C# 8 - octave 3 - B_ 8 - A_ 8 - notetype 12, 12, 3 - octave 4 - E_ 4 - E_ 2 - C# 2 - notetype 12, 12, 5 - duty 3 + note_type 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 + note_type 12, 11, 7 + duty_cycle 2 + octave 3 + note A_, 8 + octave 4 + note C#, 8 + note E_, 8 + note C#, 8 + note_type 12, 12, 5 + duty_cycle 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 + note_type 12, 11, 7 + duty_cycle 2 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + note_type 12, 12, 3 + octave 4 + note E_, 4 + note E_, 2 + note C#, 2 + note_type 12, 12, 5 + duty_cycle 3 octave 1 - B_ 1 + note B_, 1 rest 3 octave 3 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 rest 4 - E_ 1 - D_ 1 + note E_, 1 + note D_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - E_ 1 + note E_, 1 rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 rest 2 - E_ 1 - C# 1 - E_ 1 + note E_, 1 + note C#, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 rest 4 - E_ 1 - D_ 1 + note E_, 1 + note D_, 1 octave 2 - B_ 1 + note B_, 1 octave 3 - E_ 1 + note E_, 1 rest 4 - F# 1 - E_ 1 - C# 1 - F# 1 - E_ 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 11, 0 + note_type 12, 11, 0 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 12, 3 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - D# 1 - D_ 1 - C# 1 - C_ 1 + note A_, 4 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 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 - 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 + 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 + note_type 12, 11, 0 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - notetype 12, 11, 0 + note C_, 4 + note_type 12, 11, 0 octave 3 - B_ 16 - notetype 12, 3, 15 + note B_, 16 + note_type 12, 3, -7 octave 4 - F# 16 - notetype 12, 12, 3 - duty 3 + note F#, 16 + note_type 12, 12, 3 + duty_cycle 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - A_ 12 - notetype 12, 12, 3 + note A_, 12 + note_type 12, 12, 3 octave 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 4 - C# 12 - notetype 12, 11, 0 - D# 16 - notetype 12, 11, 7 - D# 16 - notetype 12, 12, 3 + note C#, 12 + note_type 12, 11, 0 + note D#, 16 + note_type 12, 11, 7 + note D#, 16 + note_type 12, 12, 3 octave 1 - A_ 1 - rest 1 - A_ 1 - rest 1 - notetype 12, 12, 7 - octave 4 - C# 12 - notetype 12, 12, 0 - A_ 8 - E_ 8 - B_ 16 - notetype 12, 12, 7 - B_ 16 - notetype 12, 12, 4 - octave 3 - D# 4 - E_ 4 - C# 2 - D# 6 - F# 4 - A_ 2 - G# 4 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note_type 12, 12, 7 + octave 4 + note C#, 12 + note_type 12, 12, 0 + note A_, 8 + note E_, 8 + note B_, 16 + note_type 12, 12, 7 + note B_, 16 + note_type 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 rest 2 - B_ 1 - octave 4 - D# 1 - F# 1 - A# 1 - notetype 12, 12, 0 - B_ 16 - F# 16 - A_ 16 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note_type 12, 12, 0 + note B_, 16 + note F#, 16 + note A_, 16 octave 5 - C# 8 + note C#, 8 rest 2 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - A_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_225e0 + note A_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_225e0 Music_GymLeaderBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 12 octave 3 - B_ 1 + note B_, 1 octave 4 - 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 + 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 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F_ 6 + note F_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 6 - notetype 12, 1, 4 + note C#, 6 + note_type 12, 1, 4 Music_GymLeaderBattle_branch_227b1:: octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - D_ 4 + note D_, 4 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 13 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - C# 12 + note C#, 12 octave 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - D# 16 + note E_, 12 + note D#, 16 octave 3 - B_ 16 - A_ 1 + note B_, 16 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 4 - E_ 12 - C# 8 - E_ 8 + note E_, 12 + note C#, 8 + note E_, 8 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 6 + note C_, 6 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - F# 2 + note F#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G_ 6 - loopchannel 0, Music_GymLeaderBattle_branch_227b1 + note G_, 6 + sound_loop 0, Music_GymLeaderBattle_branch_227b1 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 69f926f6..80dafaa6 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,96 +1,96 @@ Music_HallOfFame_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 2, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 rest 16 rest 16 rest 16 rest 12 octave 3 - D_ 1 - E_ 1 - F_ 1 - F# 1 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 Music_HallOfFame_branch_7fbc5:: - notetype 12, 8, 0 + note_type 12, 8, 0 octave 4 - C_ 16 - E_ 16 - F# 16 - notetype 12, 6, 0 - F_ 16 - loopchannel 3, Music_HallOfFame_branch_7fbc5 + note C_, 16 + note E_, 16 + note F#, 16 + note_type 12, 6, 0 + note F_, 16 + sound_loop 3, Music_HallOfFame_branch_7fbc5 rest 16 rest 16 rest 16 rest 16 - loopchannel 0, Music_HallOfFame_branch_7fbc5 + sound_loop 0, Music_HallOfFame_branch_7fbc5 Music_HallOfFame_Ch2:: vibrato 8, 2, 5 - duty 3 + duty_cycle 3 Music_HallOfFame_branch_7fbdf:: - notetype 12, 12, 4 + note_type 12, 12, 4 octave 3 - G_ 2 - D_ 2 - G_ 2 - A_ 10 - G_ 2 - D_ 2 - G_ 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - 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 + 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 + sound_loop 0, Music_HallOfFame_branch_7fbdf Music_HallOfFame_Ch3:: - notetype 12, 1, 2 + note_type 12, 1, 2 Music_HallOfFame_branch_7fbfe:: octave 4 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - D_ 2 - G_ 2 - loopchannel 12, Music_HallOfFame_branch_7fbfe - 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 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + sound_loop 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 + sound_loop 0, Music_HallOfFame_Ch3 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 61623e39..cc3c2cef 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,321 +1,321 @@ Music_IndigoPlateau_Ch1:: tempo 132 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 octave 2 - A_ 8 - A_ 8 - A_ 8 - A_ 4 - notetype 12, 10, 4 - A# 4 + note A_, 8 + note A_, 8 + note A_, 8 + note A_, 4 + note_type 12, 10, 4 + note A#, 4 Music_IndigoPlateau_branch_a605:: - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note D#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 10, 0 + note D_, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 10, 0 octave 2 - A# 4 - callchannel Music_IndigoPlateau_branch_a659 - notetype 12, 11, 4 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a659 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 13, 4 + note D_, 4 + note_type 12, 13, 4 octave 3 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - notetype 12, 11, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 13, 4 + note D#, 4 + note_type 12, 13, 4 octave 3 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - A# 4 - notetype 12, 11, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note_type 12, 11, 4 octave 3 - F_ 2 - notetype 12, 11, 4 + note F_, 2 + note_type 12, 11, 4 octave 3 - G_ 2 - notetype 12, 11, 0 - A_ 8 + note G_, 2 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 14 + note F_, 8 + note_type 12, 4, -6 octave 2 - A# 8 - loopchannel 0, Music_IndigoPlateau_branch_a605 + note A#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a605 Music_IndigoPlateau_branch_a659:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - A_ 4 - endchannel + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + sound_ret Music_IndigoPlateau_Ch2:: - duty 3 + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - D_ 8 - D_ 8 - D_ 8 - D_ 4 - notetype 12, 5, 10 - D# 4 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 4 + note_type 12, 5, -2 + note D#, 4 Music_IndigoPlateau_branch_a673:: - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 7 - C# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A_ 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 - A# 4 - callchannel Music_IndigoPlateau_branch_a6af - notetype 12, 12, 5 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 7 + note C#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A_, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 + note A#, 4 + sound_call Music_IndigoPlateau_branch_a6af + note_type 12, 12, 5 octave 4 - C_ 2 - notetype 12, 12, 7 + note C_, 2 + note_type 12, 12, 7 octave 4 - C# 2 - D_ 8 + note C#, 2 + note D_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - C_ 8 - notetype 12, 4, 13 + note C_, 8 + note_type 12, 4, -5 octave 4 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a673 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a673 Music_IndigoPlateau_branch_a6af:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - D_ 4 - endchannel + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + sound_ret Music_IndigoPlateau_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 6 - D_ 2 + note D_, 2 rest 2 - D# 4 + note D#, 4 Music_IndigoPlateau_branch_a6c6:: - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - F# 4 - callchannel Music_IndigoPlateau_branch_a6fe - callchannel Music_IndigoPlateau_branch_a6fe - D_ 2 + note F#, 4 + sound_call Music_IndigoPlateau_branch_a6fe + sound_call Music_IndigoPlateau_branch_a6fe + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - A# 1 + note A#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - A_ 8 - D_ 8 - A# 8 - D# 8 - loopchannel 0, Music_IndigoPlateau_branch_a6c6 + note A_, 8 + note D_, 8 + note A#, 8 + note D#, 8 + sound_loop 0, Music_IndigoPlateau_branch_a6c6 Music_IndigoPlateau_branch_a6fe:: octave 4 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - D_ 2 + note D_, 2 rest 2 - A_ 4 - endchannel + note A_, 4 + sound_ret Music_IndigoPlateau_Ch4:: - dspeed 6 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 16 - mutedsnare2 8 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 - mutedsnare3 1 + drum_speed 6 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 Music_IndigoPlateau_branch_a728:: - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a791 - callchannel Music_IndigoPlateau_branch_a7a8 - callchannel Music_IndigoPlateau_branch_a77e - callchannel Music_IndigoPlateau_branch_a7a8 - 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 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a791 + sound_call Music_IndigoPlateau_branch_a7a8 + sound_call Music_IndigoPlateau_branch_a77e + sound_call Music_IndigoPlateau_branch_a7a8 + drum_note 17, 16 + drum_note 17, 8 + drum_note 18, 8 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + sound_loop 0, Music_IndigoPlateau_branch_a728 Music_IndigoPlateau_branch_a77e:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare4 2 - mutedsnare3 2 - endchannel + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 2 + drum_note 18, 2 + sound_ret Music_IndigoPlateau_branch_a791:: - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare3 4 - mutedsnare2 4 - mutedsnare3 4 - mutedsnare4 4 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 - endchannel + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 19, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_ret Music_IndigoPlateau_branch_a7a8:: - 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 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm index fd4a8e35..681631f6 100644 --- a/audio/music/introbattle.asm +++ b/audio/music/introbattle.asm @@ -1,329 +1,329 @@ Music_IntroBattle_Ch1:: tempo 98 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 1 + toggle_perfect_pitch + note_type 12, 11, 1 rest 8 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 10, 0 - A# 4 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 10, 0 + note A#, 4 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 2, 9 + note A_, 2 + note A_, 2 + note_type 12, 2, -1 octave 3 - G_ 4 - notetype 12, 11, 0 - A_ 8 + note G_, 4 + note_type 12, 11, 0 + note A_, 8 octave 2 - A_ 8 - notetype 12, 11, 7 + note A_, 8 + note_type 12, 11, 7 octave 3 - F_ 8 - notetype 12, 4, 15 + note F_, 8 + note_type 12, 4, -7 octave 2 - F_ 8 - notetype 12, 11, 1 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note F_, 8 + note_type 12, 11, 1 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D_ 4 - notetype 12, 11, 1 + note D_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - D# 4 - notetype 12, 11, 1 + note D#, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - F_ 4 - notetype 12, 11, 1 + note F_, 4 + note_type 12, 11, 1 octave 2 - A_ 2 - A_ 2 - notetype 12, 11, 4 + note A_, 2 + note A_, 2 + note_type 12, 11, 4 octave 3 - G_ 4 - notetype 12, 11, 0 - F# 16 - notetype 12, 11, 1 + note G_, 4 + note_type 12, 11, 0 + note F#, 16 + note_type 12, 11, 1 octave 4 - D_ 16 - endchannel + note D_, 16 + sound_ret Music_IntroBattle_Ch2:: - duty 3 + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 rest 8 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 11, 7 - C# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 11, 7 + note C#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 7 + note D_, 2 + note D_, 2 + note_type 12, 12, 7 octave 4 - C# 4 - D_ 8 + note C#, 4 + note D_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - C_ 8 + note C_, 8 octave 3 - C_ 8 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A_ 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 - A# 4 - notetype 12, 12, 2 - D_ 2 - D_ 2 - notetype 12, 12, 5 + note C_, 8 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A_, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 + note A#, 4 + note_type 12, 12, 2 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 octave 4 - C_ 4 - notetype 12, 12, 2 + note C_, 4 + note_type 12, 12, 2 octave 3 - D_ 2 - D_ 2 - notetype 12, 12, 5 + note D_, 2 + note D_, 2 + note_type 12, 12, 5 octave 4 - C# 4 - notetype 12, 2, 15 - D_ 16 - notetype 12, 12, 1 + note C#, 4 + note_type 12, 2, -7 + note D_, 16 + note_type 12, 12, 1 octave 5 - D_ 16 - endchannel + note D_, 16 + sound_ret Music_IntroBattle_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 8 octave 4 - D_ 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 4 - D_ 1 + note F#, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - A_ 8 - D_ 8 - A# 8 - D_ 8 - D_ 1 + note A#, 4 + note A_, 8 + note D_, 8 + note A#, 8 + note D_, 8 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 4 - D_ 1 + note A_, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - D_ 1 + note A#, 4 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 4 - A_ 16 - D_ 1 + note A#, 4 + note A_, 16 + note D_, 1 rest 15 - endchannel + sound_ret Music_IntroBattle_Ch4:: - dspeed 6 - 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 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 16 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 8 + drum_note 17, 4 + drum_note 17, 16 + drum_note 17, 16 + drum_note 17, 2 rest 16 rest 14 - endchannel + sound_ret diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm index 9a01246b..d8995fbd 100644 --- a/audio/music/jigglypuffsong.asm +++ b/audio/music/jigglypuffsong.asm @@ -2,39 +2,39 @@ Music_JigglypuffSong_Ch1:: tempo 144 volume 7, 7 vibrato 8, 2, 4 - duty 2 - dutycycle 165 - toggleperfectpitch - notetype 13, 6, 7 + duty_cycle 2 + duty_cycle_pattern 2, 2, 1, 1 + toggle_perfect_pitch + note_type 13, 6, 7 octave 4 - E_ 8 - notetype 12, 6, 7 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + note E_, 8 + note_type 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 + sound_ret Music_JigglypuffSong_Ch2:: vibrato 5, 1, 5 - duty 2 - dutycycle 10 - notetype 12, 10, 7 + duty_cycle 2 + duty_cycle_pattern 0, 0, 2, 2 + note_type 12, 10, 7 octave 4 - E_ 8 - B_ 2 - G# 6 - F# 8 - G# 2 - A_ 6 - G# 8 - F# 4 - G# 4 - E_ 10 - endchannel + 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 + sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm index 7b60cc24..70fff2e5 100644 --- a/audio/music/lavender.asm +++ b/audio/music/lavender.asm @@ -1,199 +1,199 @@ Music_Lavender_Ch1:: tempo 152 volume 7, 7 - duty 1 - toggleperfectpitch + duty_cycle 1 + toggle_perfect_pitch vibrato 0, 8, 8 - notetype 12, 8, 7 + note_type 12, 8, 7 rest 16 rest 16 rest 16 rest 16 - notetype 12, 10, 7 + note_type 12, 10, 7 Music_Lavender_branch_bb6b:: octave 3 - 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 + 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 octave 4 - C_ 8 - C_ 8 + note C_, 8 + note C_, 8 octave 3 - 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 - rest 16 - loopchannel 0, Music_Lavender_branch_bb6b + 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 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, Music_Lavender_branch_bb6b Music_Lavender_Ch2:: vibrato 0, 3, 4 - duty 3 - notetype 12, 9, 1 + duty_cycle 3 + note_type 12, 9, 1 Music_Lavender_branch_bba5:: octave 5 - C_ 4 - G_ 4 - B_ 4 - F# 4 - loopchannel 0, Music_Lavender_branch_bba5 + note C_, 4 + note G_, 4 + note B_, 4 + note F#, 4 + sound_loop 0, Music_Lavender_branch_bba5 Music_Lavender_Ch3:: vibrato 4, 1, 1 - notetype 12, 3, 5 + note_type 12, 3, 5 rest 16 rest 16 rest 16 rest 16 - notetype 12, 2, 5 + note_type 12, 2, 5 Music_Lavender_branch_bbb9:: octave 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - notetype 12, 3, 5 + note E_, 4 + note_type 12, 3, 5 octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 - notetype 12, 2, 5 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note_type 12, 2, 5 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 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 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - E_ 16 - D_ 16 - C_ 16 - E_ 4 - C_ 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - E_ 4 - notetype 12, 2, 5 + note E_, 4 + note_type 12, 2, 5 octave 6 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 7 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 8 - B_ 4 - G_ 4 - F# 4 - B_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 octave 4 - E_ 4 - G_ 4 - F# 4 - B_ 4 - loopchannel 0, Music_Lavender_branch_bbb9 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + sound_loop 0, Music_Lavender_branch_bbb9 Music_Lavender_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 rest 16 Music_Lavender_branch_bc26:: - triangle2 8 - triangle2 8 - loopchannel 0, Music_Lavender_branch_bc26 + drum_note 7, 8 + drum_note 7, 8 + sound_loop 0, Music_Lavender_branch_bc26 diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm index 2378a03a..eb7b5944 100644 --- a/audio/music/meeteviltrainer.asm +++ b/audio/music/meeteviltrainer.asm @@ -1,80 +1,80 @@ Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 rest 4 octave 3 - D_ 2 - C# 2 - notetype 12, 4, 15 - D_ 4 + note D_, 2 + note C#, 2 + note_type 12, 4, -7 + note D_, 4 Music_MeetEvilTrainer_branch_7f6ae:: - notetype 12, 10, 1 - D_ 4 - D_ 4 - D_ 4 - notetype 12, 7, 0 - D_ 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae + note_type 12, 10, 1 + note D_, 4 + note D_, 4 + note D_, 4 + note_type 12, 7, 0 + note D_, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ae Music_MeetEvilTrainer_Ch2:: - duty 1 - notetype 12, 11, 6 + duty_cycle 1 + note_type 12, 11, 6 octave 3 - B_ 2 - A# 2 - B_ 8 + note B_, 2 + note A#, 2 + note B_, 8 Music_MeetEvilTrainer_branch_7f6c2:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D# 2 - D_ 2 - C# 2 - C_ 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 octave 3 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 4, 15 - A# 4 - notetype 12, 12, 2 - G_ 2 - G# 2 - A_ 2 - A# 2 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - B_ 4 - notetype 12, 3, 15 - A# 4 - notetype 12, 12, 2 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note_type 12, 4, -7 + note A#, 4 + note_type 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 + note_type 12, 3, -7 + note A#, 4 + note_type 12, 12, 2 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6c2 Music_MeetEvilTrainer_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 8 octave 4 - F# 1 + note F#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 Music_MeetEvilTrainer_branch_7f6ee:: - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - A# 4 - loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee + note A#, 4 + sound_loop 0, Music_MeetEvilTrainer_branch_7f6ee diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm index 0f24f99e..c76483e5 100644 --- a/audio/music/meetfemaletrainer.asm +++ b/audio/music/meetfemaletrainer.asm @@ -1,118 +1,118 @@ Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 - duty 1 - toggleperfectpitch - notetype 12, 11, 2 + duty_cycle 1 + toggle_perfect_pitch + note_type 12, 11, 2 octave 3 - G# 6 + note G#, 6 octave 4 - E_ 2 - D# 2 - C# 2 - C_ 2 - notetype 12, 8, 1 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + note_type 12, 8, 1 Music_MeetFemaleTrainer_branch_7f70c:: octave 3 - E_ 4 - loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c - E_ 4 + note E_, 4 + sound_loop 12, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 octave 2 - B_ 4 - B_ 4 + note B_, 4 + note B_, 4 octave 3 - E_ 4 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f70c Music_MeetFemaleTrainer_Ch2:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 3 - B_ 2 - notetype 12, 12, 7 + note B_, 2 + note_type 12, 12, 7 octave 4 - B_ 12 + note B_, 12 Music_MeetFemaleTrainer_branch_7f726:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - D# 4 - E_ 4 - D# 4 - C# 2 - C_ 2 + note D#, 4 + note E_, 4 + note D#, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - A# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - 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 + 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 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f726 Music_MeetFemaleTrainer_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 8 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 Music_MeetFemaleTrainer_branch_7f756:: - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - callchannel Music_MeetFemaleTrainer_branch_7f770 - G# 1 + sound_call Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + sound_loop 0, Music_MeetFemaleTrainer_branch_7f756 Music_MeetFemaleTrainer_branch_7f770:: - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - endchannel + sound_ret diff --git a/audio/music/meetjessiejames.asm b/audio/music/meetjessiejames.asm index 086fef53..7f1f4598 100644 --- a/audio/music/meetjessiejames.asm +++ b/audio/music/meetjessiejames.asm @@ -1,309 +1,309 @@ Music_MeetJessieJames_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - G# 1 - G_ 1 - F# 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - C_ 2 - notetype 12, 11, 6 - D# 12 - C_ 4 + 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 + note_type 12, 11, 6 + note D#, 12 + note C_, 4 Music_MeetJessieJames_branch_83187:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 4 - D_ 16 + note D_, 16 rest 12 - notetype 12, 11, 4 + note_type 12, 11, 4 octave 3 - A# 4 + note A#, 4 rest 16 rest 8 - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - 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 + 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 octave 2 - A# 4 - notetype 12, 11, 4 + note A#, 4 + note_type 12, 11, 4 octave 3 - B_ 4 - notetype 12, 11, 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 + note B_, 4 + note_type 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 octave 2 - A# 2 + note A#, 2 octave 3 - B_ 2 - notetype 12, 11, 4 - A# 4 - loopchannel 0, Music_MeetJessieJames_branch_83187 + note B_, 2 + note_type 12, 11, 4 + note A#, 4 + sound_loop 0, Music_MeetJessieJames_branch_83187 Music_MeetJessieJames_Ch2:: - duty 3 + duty_cycle 3 vibrato 6, 1, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - D_ 1 - C# 1 - C_ 2 + note D_, 1 + note C#, 1 + note C_, 2 octave 3 - B_ 2 - A# 2 - A_ 2 - G# 2 - G_ 2 - F# 2 - notetype 12, 12, 7 - A_ 12 + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note_type 12, 12, 7 + note A_, 12 octave 4 - C# 4 + note C#, 4 Music_MeetJessieJames_branch_831df:: - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - 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 + 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 octave 2 - A_ 4 - notetype 12, 12, 5 + note A_, 4 + note_type 12, 12, 5 octave 4 - C# 4 - notetype 12, 12, 2 - D_ 1 + note C#, 4 + note_type 12, 12, 2 + note D_, 1 octave 3 - 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 + 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 + note_type 12, 12, 6 octave 4 - D_ 8 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 + note D_, 8 + note_type 12, 12, 2 + note D#, 6 + note F_, 4 + note D#, 4 octave 3 - A# 2 + note A#, 2 octave 4 - D# 6 - F_ 4 - D# 2 - notetype 12, 12, 5 - D_ 4 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 + note D#, 6 + note F_, 4 + note D#, 2 + note_type 12, 12, 5 + note D_, 4 + note_type 12, 12, 2 + note D#, 6 + note F_, 4 + note D#, 4 octave 3 - A# 2 + note A#, 2 octave 4 - D# 4 - F_ 4 - notetype 12, 12, 5 - D# 8 - loopchannel 0, Music_MeetJessieJames_branch_831df + note D#, 4 + note F_, 4 + note_type 12, 12, 5 + note D#, 8 + sound_loop 0, Music_MeetJessieJames_branch_831df Music_MeetJessieJames_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 rest 8 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 - D# 2 + note C_, 2 + note D#, 2 Music_MeetJessieJames_branch_83235:: - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A# 2 - A_ 2 - D# 2 - D_ 1 + note A#, 2 + note A_, 2 + note D#, 2 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 - D_ 2 - D# 1 + note C_, 2 + note D_, 2 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - A# 1 + note A#, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - A# 1 + note A#, 1 rest 1 - D# 1 + note D#, 1 rest 1 octave 3 - A# 1 + note A#, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - loopchannel 0, Music_MeetJessieJames_branch_83235 - endchannel + sound_loop 0, Music_MeetJessieJames_branch_83235 + sound_ret diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm index 92047849..a2786052 100644 --- a/audio/music/meetmaletrainer.asm +++ b/audio/music/meetmaletrainer.asm @@ -1,190 +1,190 @@ Music_MeetMaleTrainer_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 20, 3, 3 - toggleperfectpitch - notetype 12, 11, 4 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 12 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 rest 16 Music_MeetMaleTrainer_branch_7f78f:: octave 3 - 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 + 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 + sound_loop 0, Music_MeetMaleTrainer_branch_7f78f Music_MeetMaleTrainer_Ch2:: - duty 3 + duty_cycle 3 vibrato 24, 2, 2 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - E_ 1 - D# 1 - D_ 1 - C# 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 octave 3 - B_ 12 + note B_, 12 rest 2 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 9 Music_MeetMaleTrainer_branch_7f7b5:: - notetype 12, 12, 4 + note_type 12, 12, 4 octave 4 - E_ 6 - D# 6 - C# 4 + note E_, 6 + note D#, 6 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - G# 2 - A_ 2 - B_ 2 - octave 4 - C# 2 - notetype 12, 12, 7 - F_ 16 - notetype 12, 12, 5 + 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 + note_type 12, 12, 7 + note F_, 16 + note_type 12, 12, 5 octave 3 - F# 8 + note F#, 8 octave 4 - C# 8 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + note C#, 8 + sound_loop 0, Music_MeetMaleTrainer_branch_7f7b5 Music_MeetMaleTrainer_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 6 octave 4 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 1 Music_MeetMaleTrainer_branch_7f7ea:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 1 + note D_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea + sound_loop 0, Music_MeetMaleTrainer_branch_7f7ea diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm index 6532a187..24c6741a 100644 --- a/audio/music/meetprofoak.asm +++ b/audio/music/meetprofoak.asm @@ -1,423 +1,423 @@ Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 12, 11, 4 + duty_cycle 3 + toggle_perfect_pitch + note_type 12, 11, 4 octave 3 - F# 1 - B_ 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 - E_ 1 - F# 12 - notetype 12, 10, 2 + note D#, 1 + note E_, 1 + note F#, 12 + note_type 12, 10, 2 octave 3 - 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 + 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 Music_MeetProfOak_branch_af85:: - 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 + 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 + sound_loop 0, Music_MeetProfOak_branch_af85 Music_MeetProfOak_Ch2:: vibrato 8, 1, 1 - duty 2 - notetype 12, 12, 4 + duty_cycle 2 + note_type 12, 12, 4 octave 3 - B_ 1 + note B_, 1 octave 4 - D# 1 - F# 1 - A# 1 - B_ 12 - notetype 12, 11, 2 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 12 + note_type 12, 11, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 6, 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 6, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 2 - D# 2 - E_ 4 - D# 2 - C# 4 - notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note_type 12, 11, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 8, 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 8, 1 octave 4 - B_ 2 - A_ 2 - G# 2 - A_ 4 - B_ 2 - B_ 4 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + note_type 12, 11, 5 Music_MeetProfOak_branch_b005:: octave 4 - C# 6 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 6 - C# 1 - E_ 1 - F# 4 - E_ 4 - D# 4 - C# 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 octave 3 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 4 - E_ 8 - notetype 12, 6, 5 + note E_, 8 + note_type 12, 6, 5 octave 4 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 5 - E_ 8 - notetype 12, 11, 5 + note E_, 8 + note_type 12, 11, 5 octave 3 - A_ 6 - F# 1 - A_ 1 + note A_, 6 + note F#, 1 + note A_, 1 octave 4 - D# 8 - E_ 4 - D# 4 - C# 4 - C_ 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 octave 3 - B_ 6 - G# 1 - B_ 1 + note B_, 6 + note G#, 1 + note B_, 1 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - notetype 12, 11, 7 - G# 16 - loopchannel 0, Music_MeetProfOak_branch_b005 + note E_, 1 + note_type 12, 11, 7 + note G#, 16 + sound_loop 0, Music_MeetProfOak_branch_b005 Music_MeetProfOak_Ch3:: - notetype 12, 1, 2 + note_type 12, 1, 2 rest 10 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 rest 6 octave 4 - B_ 1 + note B_, 1 rest 5 octave 5 - E_ 4 + note E_, 4 octave 4 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G# 1 + note G#, 1 rest 1 Music_MeetProfOak_branch_b0bc:: octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b0bc Music_MeetProfOak_branch_b0d8:: octave 4 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0d8 + sound_loop 2, Music_MeetProfOak_branch_b0d8 Music_MeetProfOak_branch_b0ed:: - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b0ed + sound_loop 2, Music_MeetProfOak_branch_b0ed Music_MeetProfOak_branch_b101:: - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - loopchannel 2, Music_MeetProfOak_branch_b101 - loopchannel 0, Music_MeetProfOak_branch_b0bc + sound_loop 2, Music_MeetProfOak_branch_b101 + sound_loop 0, Music_MeetProfOak_branch_b0bc diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm index 153523af..958db7be 100644 --- a/audio/music/meetrival.asm +++ b/audio/music/meetrival.asm @@ -1,396 +1,396 @@ Music_MeetRival_branch_b119:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b123 + sound_loop 0, Music_MeetRival_branch_b123 Music_MeetRival_Ch1:: tempo 112 Music_MeetRival_branch_b123:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - D_ 1 - C# 1 - C_ 1 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - A# 2 - A_ 1 - G# 1 - G_ 1 - F# 1 - F_ 6 - D_ 1 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 + note A_, 2 + note G_, 2 + note A_, 2 Music_MeetRival_branch_b140:: - B_ 4 - A# 2 - A_ 4 - G_ 2 + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 rest 4 - D_ 4 - C# 2 - C_ 2 + note D_, 4 + note C#, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 4 - E_ 2 - D_ 4 - C_ 2 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 + note C_, 2 rest 4 - G_ 4 - G_ 2 - F# 2 - E_ 2 - D_ 2 - F# 2 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - F# 2 + note D_, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - D_ 2 + note D_, 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - D_ 2 + note D_, 2 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 4 - C_ 2 - F_ 2 + note C_, 2 + note F_, 2 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - F_ 2 - D# 2 - C_ 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 octave 3 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 rest 4 - A# 4 + note A#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - C_ 2 - notetype 12, 11, 7 + note C_, 2 + note_type 12, 11, 7 octave 3 - G_ 4 - D_ 2 - F_ 6 - F# 4 - D_ 2 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 rest 4 - D_ 4 - notetype 12, 11, 3 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note D_, 4 + note_type 12, 11, 3 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_branch_b19b:: tempo 100 - loopchannel 0, Music_MeetRival_branch_b1a5 + sound_loop 0, Music_MeetRival_branch_b1a5 Music_MeetRival_branch_b1a2:: tempo 112 Music_MeetRival_branch_b1a5:: volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 5 - A_ 2 - G_ 2 - A_ 2 - loopchannel 0, Music_MeetRival_branch_b140 + note A_, 2 + note G_, 2 + note A_, 2 + sound_loop 0, Music_MeetRival_branch_b140 Music_MeetRival_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 6 - notetype 12, 12, 7 - octave 4 - B_ 1 - A# 1 - A_ 1 - G# 1 - G_ 2 - F# 1 - F_ 1 - E_ 1 - D# 1 - D_ 6 + note_type 12, 12, 7 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 6 octave 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 octave 4 - D_ 2 - F_ 2 - F# 2 + note D_, 2 + note F_, 2 + note F#, 2 Music_MeetRival_branch_b1d8:: - notetype 12, 12, 7 - G_ 4 - D_ 2 - F_ 6 - F# 4 - G_ 2 + note_type 12, 12, 7 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 rest 4 - G_ 4 - G_ 2 - A# 2 - B_ 2 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 2 - A# 6 - B_ 4 + note G_, 2 + note A#, 6 + note B_, 4 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - C_ 2 - notetype 12, 11, 0 - D_ 16 - notetype 12, 11, 5 - D_ 6 - notetype 12, 12, 7 - F_ 4 - D_ 2 - C_ 2 - D_ 2 - notetype 12, 11, 0 - C_ 8 - notetype 12, 12, 7 - C_ 8 - octave 4 - C_ 2 + note C_, 2 + note_type 12, 11, 0 + note D_, 16 + note_type 12, 11, 5 + note D_, 6 + note_type 12, 12, 7 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 + octave 4 + note C_, 2 rest 4 - A# 4 - G_ 2 - F_ 2 - notetype 12, 11, 0 - G_ 16 - notetype 12, 11, 3 - G_ 2 + note A#, 4 + note G_, 2 + note F_, 2 + note_type 12, 11, 0 + note G_, 16 + note_type 12, 11, 3 + note G_, 2 octave 3 - G_ 2 + note G_, 2 rest 4 - G_ 4 + note G_, 4 octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 Music_MeetRival_branch_b21d:: - duty 3 + duty_cycle 3 vibrato 10, 2, 6 - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 octave 4 - D_ 2 - F_ 2 - F# 2 - loopchannel 0, Music_MeetRival_branch_b1d8 + note D_, 2 + note F_, 2 + note F#, 2 + sound_loop 0, Music_MeetRival_branch_b1d8 Music_MeetRival_Ch3:: - notetype 12, 1, 4 + note_type 12, 1, 4 octave 5 - D_ 2 + note D_, 2 rest 2 - C# 2 + note C#, 2 rest 2 - C_ 2 + note C_, 2 rest 2 octave 4 - B_ 2 + note B_, 2 rest 2 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 Music_MeetRival_branch_b24b:: - G_ 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 4 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 2 - A# 2 - B_ 2 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - C_ 2 + note C_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 octave 5 - C_ 2 + note C_, 2 rest 4 - C_ 4 - C_ 2 + note C_, 4 + note C_, 2 octave 4 - B_ 2 - A_ 2 - F# 2 - A_ 2 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 rest 2 - A_ 2 - F# 2 - A_ 2 + note A_, 2 + note F#, 2 + note A_, 2 rest 2 - F# 2 - A_ 2 - F# 2 + note F#, 2 + note A_, 2 + note F#, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - A_ 2 - E_ 2 + note A_, 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 rest 2 octave 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - E_ 2 - F_ 2 - G_ 2 - E_ 2 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 octave 5 - C_ 2 + note C_, 2 octave 4 - B_ 2 - A# 2 - A_ 2 - G_ 2 - A# 2 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 rest 2 - G_ 2 - A# 2 - G_ 2 + note G_, 2 + note A#, 2 + note G_, 2 rest 2 - A# 2 - G_ 2 + note A#, 2 + note G_, 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 + note D_, 2 octave 4 - G_ 2 + note G_, 2 rest 2 octave 5 - D_ 2 - loopchannel 0, Music_MeetRival_branch_b24b + note D_, 2 + sound_loop 0, Music_MeetRival_branch_b24b Music_MeetRival_branch_b2b5:: - notetype 12, 1, 4 + note_type 12, 1, 4 octave 4 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - loopchannel 0, Music_MeetRival_branch_b24b + sound_loop 0, Music_MeetRival_branch_b24b diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm index cb08fcf4..60ebd553 100644 --- a/audio/music/museumguy.asm +++ b/audio/music/museumguy.asm @@ -1,337 +1,337 @@ Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 11, 1 octave 3 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 2 - F# 2 - E_ 2 - D# 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 octave 2 - B_ 4 - B_ 1 + note B_, 4 + note B_, 1 octave 3 - D# 1 - E_ 1 - G# 1 - B_ 10 - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 + note D#, 1 + note E_, 1 + note G#, 1 + note B_, 10 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 Music_MuseumGuy_branch_add6:: - callchannel Music_MuseumGuy_branch_ade7 - callchannel Music_MuseumGuy_branch_adec - callchannel Music_MuseumGuy_branch_ade7 - E_ 4 - E_ 4 - E_ 2 - E_ 6 - loopchannel 0, Music_MuseumGuy_branch_add6 + sound_call Music_MuseumGuy_branch_ade7 + sound_call Music_MuseumGuy_branch_adec + sound_call Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + sound_loop 0, Music_MuseumGuy_branch_add6 Music_MuseumGuy_branch_ade7:: - E_ 2 - E_ 6 - F# 2 - F# 6 - endchannel + note E_, 2 + note E_, 6 + note F#, 2 + note F#, 6 + sound_ret Music_MuseumGuy_branch_adec:: - E_ 2 - E_ 6 - D_ 2 - D_ 6 - endchannel + note E_, 2 + note E_, 6 + note D_, 2 + note D_, 6 + sound_ret Music_MuseumGuy_Ch2:: - duty 2 - notetype 12, 12, 1 + duty_cycle 2 + note_type 12, 12, 1 octave 4 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - E_ 4 - E_ 1 - G# 1 - B_ 1 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 octave 4 - D# 1 - E_ 8 + note D#, 1 + note E_, 8 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - F# 2 - A_ 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 2 - C# 2 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 + note B_, 4 + note A_, 2 octave 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 + 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 Music_MuseumGuy_branch_ae26:: octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 3 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 9, 1 - A_ 1 - notetype 12, 12, 1 + note C#, 2 + note E_, 3 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 9, 1 + note A_, 1 + note_type 12, 12, 1 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - E_ 4 - D_ 1 - C# 1 - C_ 1 + note C#, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C_, 1 octave 3 - B_ 1 - B_ 3 - notetype 12, 10, 1 - G# 1 - notetype 12, 12, 1 - A_ 2 + note B_, 1 + note B_, 3 + note_type 12, 10, 1 + note G#, 1 + note_type 12, 12, 1 + note A_, 2 octave 4 - C# 2 - E_ 3 - notetype 12, 9, 1 - E_ 1 - notetype 12, 12, 1 - D_ 2 - F# 2 - A_ 3 - notetype 12, 8, 1 - A_ 1 - notetype 12, 12, 1 - G# 2 - E_ 1 - notetype 12, 8, 1 - E_ 1 - notetype 12, 12, 1 - F# 2 - notetype 12, 8, 1 - F# 1 - notetype 12, 12, 1 - G# 1 - A_ 2 - A_ 2 - A_ 4 - loopchannel 0, Music_MuseumGuy_branch_ae26 + note C#, 2 + note E_, 3 + note_type 12, 9, 1 + note E_, 1 + note_type 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + note_type 12, 8, 1 + note A_, 1 + note_type 12, 12, 1 + note G#, 2 + note E_, 1 + note_type 12, 8, 1 + note E_, 1 + note_type 12, 12, 1 + note F#, 2 + note_type 12, 8, 1 + note F#, 1 + note_type 12, 12, 1 + note G#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + sound_loop 0, Music_MuseumGuy_branch_ae26 Music_MuseumGuy_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 16 octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 9 - callchannel Music_MuseumGuy_branch_aeb8 - A_ 1 + sound_call Music_MuseumGuy_branch_aeb8 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 5 - callchannel Music_MuseumGuy_branch_aeb8 - B_ 1 + sound_call Music_MuseumGuy_branch_aeb8 + note B_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 Music_MuseumGuy_branch_ae8e:: - callchannel Music_MuseumGuy_branch_aec1 + sound_call Music_MuseumGuy_branch_aec1 rest 3 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - callchannel Music_MuseumGuy_branch_aec1 + sound_call Music_MuseumGuy_branch_aec1 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - loopchannel 0, Music_MuseumGuy_branch_ae8e + sound_loop 0, Music_MuseumGuy_branch_ae8e Music_MuseumGuy_branch_aeb8:: - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 5 - endchannel + sound_ret Music_MuseumGuy_branch_aec1:: octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 octave 6 - F# 1 + note F#, 1 rest 1 octave 5 - A_ 1 + note A_, 1 rest 1 - A_ 1 - endchannel + note A_, 1 + sound_ret Music_MuseumGuy_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 16 rest 16 rest 16 rest 16 rest 14 - dspeed 6 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_MuseumGuy_branch_aee1:: - 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 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 6 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_loop 0, Music_MuseumGuy_branch_aee1 diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm index 7214264c..5af9f9a9 100644 --- a/audio/music/oakslab.asm +++ b/audio/music/oakslab.asm @@ -1,393 +1,393 @@ Music_OaksLab_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 16, 1, 2 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 2 - B_ 1 + note B_, 1 octave 3 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 - A_ 1 - B_ 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note B_, 1 Music_OaksLab_branch_7eed0:: octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 4 - G# 2 - A_ 2 - B_ 1 + note A_, 4 + note G#, 2 + note A_, 2 + note B_, 1 rest 3 - A_ 6 - G# 1 - B_ 1 + note A_, 6 + note G#, 1 + note B_, 1 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - G# 2 - A_ 2 - F# 4 - E_ 2 - F# 2 - G# 1 + note A_, 4 + note G#, 2 + note A_, 2 + note F#, 4 + note E_, 2 + note F#, 2 + note G#, 1 rest 3 - F# 8 - E_ 4 - A_ 6 - E_ 1 - A_ 1 + note F#, 8 + note E_, 4 + note A_, 6 + note E_, 1 + note A_, 1 octave 4 - D_ 8 - C# 6 + note D_, 8 + note C#, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - C# 1 - E_ 8 - D_ 4 - C# 4 + note C#, 1 + note E_, 8 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - G# 1 + note B_, 4 + note A_, 4 + note G#, 1 rest 3 - E_ 4 - F# 4 - G# 4 - loopchannel 0, Music_OaksLab_branch_7eed0 + note E_, 4 + note F#, 4 + note G#, 4 + sound_loop 0, Music_OaksLab_branch_7eed0 Music_OaksLab_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 4 + note_type 12, 12, 4 octave 3 - G# 1 - A_ 1 - B_ 1 + note G#, 1 + note A_, 1 + note B_, 1 octave 4 - C# 1 - D_ 1 - E_ 1 - F# 1 - G# 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 Music_OaksLab_branch_7ef16:: - A_ 6 - G# 1 - F# 1 - E_ 6 - D# 1 - E_ 1 - F# 1 + note A_, 6 + note G#, 1 + note F#, 1 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 1 rest 3 - E_ 8 - E_ 4 - F# 6 - E_ 1 - D_ 1 - C# 6 + note E_, 8 + note E_, 4 + note F#, 6 + note E_, 1 + note D_, 1 + note C#, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - D_ 1 + note C#, 1 + note D_, 1 rest 3 - C# 8 - C# 4 - D_ 6 + note C#, 8 + note C#, 4 + note D_, 6 octave 3 - A_ 1 + note A_, 1 octave 4 - 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 + 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 rest 1 octave 3 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - loopchannel 0, Music_OaksLab_branch_7ef16 + sound_loop 0, Music_OaksLab_branch_7ef16 Music_OaksLab_Ch3:: - notetype 12, 1, 1 + note_type 12, 1, 1 rest 2 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 Music_OaksLab_branch_7ef5c:: - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 5 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 3 - A_ 1 + note A_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - C# 1 + note C#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - loopchannel 0, Music_OaksLab_branch_7ef5c + sound_loop 0, Music_OaksLab_branch_7ef5c diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 0c8b7dbc..26e5710f 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,314 +1,314 @@ Music_PalletTown_Ch1:: tempo 160 volume 7, 7 - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 Music_PalletTown_branch_a7ce:: octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - C_ 2 + note D_, 4 + note D_, 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 rest 2 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 8 + note C_, 8 rest 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 - B_ 2 - G_ 2 - A_ 2 - F# 2 - B_ 4 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F#, 2 + note B_, 4 octave 4 - C_ 2 - D_ 4 - G_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 4 - G_ 2 + note B_, 4 + note G_, 2 octave 4 - D_ 4 - D_ 2 - G_ 2 - F# 2 - E_ 4 - D_ 2 - C_ 4 + note D_, 4 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note C_, 4 octave 3 - A_ 2 - B_ 2 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 2 + note D_, 2 + note C_, 2 octave 3 - B_ 2 - A_ 2 - G_ 4 - F# 4 + note B_, 2 + note A_, 2 + note G_, 4 + note F#, 4 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 - F# 2 - A_ 2 - notetype 12, 11, 3 - B_ 2 - G_ 2 - D_ 2 - G_ 2 - B_ 2 - G_ 2 - D_ 2 - G_ 2 + note A_, 2 + note F#, 2 + note A_, 2 + note_type 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 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - E_ 2 - G_ 2 + note G_, 2 + note E_, 2 + note G_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - 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 + 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 + sound_loop 0, Music_PalletTown_branch_a7ce + sound_ret Music_PalletTown_Ch2:: - duty 2 + duty_cycle 2 Music_PalletTown_branch_a861:: - notetype 12, 13, 3 + note_type 12, 13, 3 octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 octave 4 - B_ 2 - notetype 12, 11, 3 - A_ 2 - notetype 12, 13, 3 + note B_, 2 + note_type 12, 11, 3 + note A_, 2 + note_type 12, 13, 3 octave 5 - G_ 2 - notetype 12, 11, 3 - E_ 2 - notetype 12, 13, 3 - F# 2 - E_ 2 - D_ 6 + note G_, 2 + note_type 12, 11, 3 + note E_, 2 + note_type 12, 13, 3 + note F#, 2 + note E_, 2 + note D_, 6 octave 4 - B_ 2 - G_ 2 - G_ 2 - A_ 2 - B_ 2 + note B_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 10 + note C_, 10 octave 4 - F# 2 - G_ 2 - A_ 2 - B_ 6 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 octave 5 - C_ 1 + note C_, 1 octave 4 - B_ 1 - A_ 8 + note B_, 1 + note A_, 8 octave 5 - D_ 2 - notetype 12, 10, 3 - C_ 2 - notetype 12, 13, 3 + note D_, 2 + note_type 12, 10, 3 + note C_, 2 + note_type 12, 13, 3 octave 4 - B_ 2 - notetype 12, 11, 3 + note B_, 2 + note_type 12, 11, 3 octave 5 - D_ 2 - notetype 12, 13, 3 - G_ 2 - notetype 12, 10, 3 - F# 2 - notetype 12, 11, 3 - F# 2 - notetype 12, 13, 3 - G_ 2 - E_ 6 - D_ 2 - D_ 8 - C_ 2 + note D_, 2 + note_type 12, 13, 3 + note G_, 2 + note_type 12, 10, 3 + note F#, 2 + note_type 12, 11, 3 + note F#, 2 + note_type 12, 13, 3 + note G_, 2 + note E_, 6 + note D_, 2 + note D_, 8 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 octave 5 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 octave 4 - B_ 2 - A_ 2 - G_ 10 - G_ 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 10 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 8 - D_ 6 - C_ 2 + note C_, 8 + note D_, 6 + note C_, 2 octave 4 - B_ 8 + note B_, 8 rest 2 - G_ 2 - A_ 2 - B_ 2 + note G_, 2 + note A_, 2 + note B_, 2 octave 5 - C_ 4 - C_ 4 - D_ 6 - C_ 1 - D_ 1 + note C_, 4 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 octave 4 - B_ 8 + note B_, 8 rest 2 - 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 + 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 + sound_loop 0, Music_PalletTown_branch_a861 + sound_ret Music_PalletTown_Ch3:: vibrato 24, 2, 8 - notetype 12, 1, 2 + note_type 12, 1, 2 Music_PalletTown_branch_a8e3:: octave 4 - 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 + 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 + sound_loop 0, Music_PalletTown_branch_a8e3 + sound_ret diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm index 2b7b545b..2fe9e4ce 100644 --- a/audio/music/pkmnhealed.asm +++ b/audio/music/pkmnhealed.asm @@ -1,47 +1,47 @@ Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 12, 8, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 12, 8, 1 rest 2 - pitchbend 0, 75 - B_ 2 - pitchbend 0, 84 - B_ 2 - pitchbend 0, 68 - E_ 2 + pitch_slide 1, 4, B_ + note B_, 2 + pitch_slide 1, 3, E_ + note B_, 2 + pitch_slide 1, 4, E_ + note E_, 2 rest 4 - pitchbend 0, 59 - E_ 4 - pitchbend 0, 75 - B_ 4 - endchannel + pitch_slide 1, 5, B_ + note E_, 4 + pitch_slide 1, 4, B_ + note B_, 4 + sound_ret Music_PkmnHealed_Ch2:: - duty 2 - notetype 12, 12, 3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 - B_ 4 - B_ 4 - B_ 2 - G# 2 - notetype 12, 12, 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + note_type 12, 12, 4 octave 5 - E_ 8 - endchannel + note E_, 8 + sound_ret Music_PkmnHealed_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - E_ 2 - G# 2 - E_ 6 + note E_, 2 + note G#, 2 + note E_, 6 rest 2 - endchannel + sound_ret diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm index 5de546ad..a4a3f2bf 100644 --- a/audio/music/pokecenter.asm +++ b/audio/music/pokecenter.asm @@ -1,375 +1,375 @@ Music_Pokecenter_Ch1:: tempo 144 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 2, 2 - toggleperfectpitch + toggle_perfect_pitch Music_Pokecenter_branch_be61:: - notetype 12, 10, 3 + note_type 12, 10, 3 octave 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + 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 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 2 - A_ 2 - G_ 2 - F# 2 - A_ 2 - B_ 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - notetype 12, 10, 3 - F# 2 - F_ 2 - F# 2 - notetype 12, 11, 5 + note B_, 2 + note A_, 2 + note_type 12, 10, 3 + note F#, 2 + note F_, 2 + note F#, 2 + note_type 12, 11, 5 octave 4 - D_ 4 - C# 2 + note D_, 4 + note C#, 2 octave 3 - B_ 2 - A_ 2 - B_ 2 - A_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - G_ 2 - A_ 2 - notetype 12, 10, 3 - A_ 2 - E_ 2 - A_ 2 - notetype 12, 11, 5 + 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 + note_type 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + note_type 12, 11, 5 octave 4 - C# 4 + note C#, 4 octave 3 - 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 + 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 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 4 - A_ 2 - B_ 2 + note B_, 4 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - D_ 2 - C# 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - E_ 2 - C# 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 octave 3 - 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 + 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 + sound_loop 0, Music_Pokecenter_branch_be61 Music_Pokecenter_Ch2:: vibrato 8, 2, 5 Music_Pokecenter_branch_befc:: - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 2 - F# 6 - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 2 + note F#, 6 + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf4e - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf4e + duty_cycle 3 + note_type 12, 10, 5 octave 3 - A_ 4 - E_ 4 - callchannel Music_Pokecenter_branch_bf60 - D_ 8 - duty 3 - notetype 12, 10, 5 + note A_, 4 + note E_, 4 + sound_call Music_Pokecenter_branch_bf60 + note D_, 8 + duty_cycle 3 + note_type 12, 10, 5 octave 3 - D_ 4 - E_ 4 - duty 2 - notetype 12, 12, 6 + note D_, 4 + note E_, 4 + duty_cycle 2 + note_type 12, 12, 6 octave 4 - 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 + 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 + sound_loop 0, Music_Pokecenter_branch_befc Music_Pokecenter_branch_bf4e:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 - notetype 12, 12, 3 - A_ 4 - G_ 4 - F# 2 - E_ 2 - C# 6 - endchannel + note D_, 2 + note_type 12, 12, 3 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + sound_ret Music_Pokecenter_branch_bf60:: - duty 2 - notetype 12, 12, 2 + duty_cycle 2 + note_type 12, 12, 2 octave 4 - C# 2 + note C#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 - notetype 12, 12, 3 - F# 4 - E_ 4 - C# 2 - endchannel + note C#, 2 + note_type 12, 12, 3 + note F#, 4 + note E_, 4 + note C#, 2 + sound_ret Music_Pokecenter_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 Music_Pokecenter_branch_bf72:: octave 4 - 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 - 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 - D_ 2 - F# 2 - D_ 2 - F# 2 - D_ 2 - B_ 2 - A_ 2 - G_ 2 - callchannel Music_Pokecenter_branch_bfeb - 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 - 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 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + sound_call Music_Pokecenter_branch_bfd9 + sound_call 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 + sound_call Music_Pokecenter_branch_bfd9 + sound_call 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 + sound_call 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 + sound_call 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 + sound_loop 0, Music_Pokecenter_branch_bf72 Music_Pokecenter_branch_bfd9:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfe2:: - E_ 2 - A_ 2 - E_ 2 - A_ 2 - E_ 2 - A_ 2 - G_ 2 - A_ 2 - endchannel + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + sound_ret Music_Pokecenter_branch_bfeb:: - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - F# 2 - A_ 2 - endchannel + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + sound_ret diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm index afae9a75..ef3a3b88 100644 --- a/audio/music/pokemontower.asm +++ b/audio/music/pokemontower.asm @@ -1,458 +1,458 @@ Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 12, 2, 3 - notetype 12, 8, 0 + note_type 12, 8, 0 rest 4 octave 4 - B_ 12 + note B_, 12 Music_PokemonTower_branch_7f05a:: - notetype 12, 11, 4 + note_type 12, 11, 4 octave 4 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 octave 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - F# 1 + note F#, 1 rest 7 - C_ 1 + note C_, 1 octave 3 - B_ 1 - G_ 1 + note B_, 1 + note G_, 1 rest 5 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 4 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C# 1 + note C#, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 3 - notetype 12, 8, 4 - C_ 1 + note_type 12, 8, 4 + note C_, 1 rest 3 - notetype 12, 11, 4 - D_ 1 + note_type 12, 11, 4 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 7 octave 3 - A_ 1 + note A_, 1 rest 7 - A_ 1 + note A_, 1 rest 7 - notetype 12, 10, 7 - B_ 8 - B_ 8 + note_type 12, 10, 7 + note B_, 8 + note B_, 8 octave 4 - C_ 8 - C_ 8 - C# 8 - C# 8 - notetype 12, 10, 6 - D_ 16 + note C_, 8 + note C_, 8 + note C#, 8 + note C#, 8 + note_type 12, 10, 6 + note D_, 16 rest 16 rest 16 rest 16 rest 16 - notetype 12, 9, 2 - B_ 4 + note_type 12, 9, 2 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 + note B_, 4 octave 5 - E_ 4 - D_ 4 - C_ 4 + note E_, 4 + note D_, 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 octave 5 - C_ 16 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f05a + note C_, 16 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f05a Music_PokemonTower_Ch2:: vibrato 20, 3, 4 - duty 3 - notetype 12, 10, 0 + duty_cycle 3 + note_type 12, 10, 0 octave 5 - C_ 12 + note C_, 12 octave 4 - E_ 4 + note E_, 4 Music_PokemonTower_branch_7f0ee:: - notetype 12, 12, 1 + note_type 12, 12, 1 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 4 - notetype 12, 12, 4 - G_ 1 - F# 1 - E_ 1 - D# 1 - notetype 12, 11, 0 - G_ 8 + note B_, 4 + note_type 12, 12, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note_type 12, 11, 0 + note G_, 8 octave 5 - C_ 8 + note C_, 8 octave 4 - B_ 4 - G_ 4 - E_ 4 - G_ 4 + note B_, 4 + note G_, 4 + note E_, 4 + note G_, 4 octave 5 - C_ 8 - notetype 12, 11, 7 - C_ 8 - notetype 12, 12, 2 + note C_, 8 + note_type 12, 11, 7 + note C_, 8 + note_type 12, 12, 2 octave 4 - G_ 1 - F# 1 - E_ 1 + note G_, 1 + note F#, 1 + note E_, 1 rest 1 - notetype 12, 9, 6 + note_type 12, 9, 6 octave 3 - G_ 4 - notetype 12, 12, 7 - G_ 4 - B_ 4 - G_ 4 - B_ 4 + note G_, 4 + note_type 12, 12, 7 + note G_, 4 + note B_, 4 + note G_, 4 + note B_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 - notetype 12, 11, 0 + note B_, 4 + note_type 12, 11, 0 octave 4 - C_ 16 - E_ 8 - notetype 12, 11, 7 - E_ 12 - notetype 12, 12, 5 + note C_, 16 + note E_, 8 + note_type 12, 11, 7 + note E_, 12 + note_type 12, 12, 5 octave 5 - C_ 4 + note C_, 4 octave 4 - B_ 4 - G_ 4 - B_ 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 11, 0 - F# 12 - G_ 4 - notetype 12, 11, 0 - F# 8 - notetype 12, 11, 7 - F# 8 - notetype 12, 11, 0 - B_ 4 - G_ 4 - F# 4 - E_ 4 - B_ 16 - notetype 12, 11, 0 + note B_, 4 + note G_, 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 11, 0 + note F#, 12 + note G_, 4 + note_type 12, 11, 0 + note F#, 8 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 11, 0 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 16 + note_type 12, 11, 0 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 4 - F# 4 - E_ 4 - notetype 12, 9, 0 + note G_, 4 + note F#, 4 + note E_, 4 + note_type 12, 9, 0 octave 5 - C_ 16 - notetype 12, 11, 0 - D_ 4 + note C_, 16 + note_type 12, 11, 0 + note D_, 4 octave 4 - A_ 4 - G# 4 - F# 4 - notetype 12, 2, 15 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 12, 2, -7 octave 5 - D_ 16 - notetype 12, 12, 0 - E_ 4 + note D_, 16 + note_type 12, 12, 0 + note E_, 4 octave 4 - B_ 4 - A_ 4 - G_ 4 + note B_, 4 + note A_, 4 + note G_, 4 octave 5 - F_ 4 - C_ 4 + note F_, 4 + note C_, 4 octave 4 - A# 4 - G# 4 + note A#, 4 + note G#, 4 octave 5 - F# 4 - D_ 4 - C_ 4 + note F#, 4 + note D_, 4 + note C_, 4 octave 4 - A# 4 - G# 4 - F# 4 - E_ 4 - D_ 4 - notetype 12, 11, 0 - C_ 8 - notetype 12, 9, 0 - C_ 8 - notetype 12, 8, 0 - C_ 8 - notetype 12, 7, 0 - C_ 8 - notetype 12, 6, 0 - C_ 8 - notetype 12, 6, 7 - C_ 8 + note A#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note_type 12, 11, 0 + note C_, 8 + note_type 12, 9, 0 + note C_, 8 + note_type 12, 8, 0 + note C_, 8 + note_type 12, 7, 0 + note C_, 8 + note_type 12, 6, 0 + note C_, 8 + note_type 12, 6, 7 + note C_, 8 rest 16 - notetype 12, 10, 0 + note_type 12, 10, 0 octave 5 - G_ 16 + note G_, 16 octave 6 - C_ 16 + note C_, 16 octave 5 - B_ 8 - G_ 8 - E_ 8 - G_ 8 + note B_, 8 + note G_, 8 + note E_, 8 + note G_, 8 octave 6 - C_ 16 + note C_, 16 vibrato 0, 3, 4 - notetype 12, 10, 7 - C_ 16 - loopchannel 0, Music_PokemonTower_branch_7f0ee + note_type 12, 10, 7 + note C_, 16 + sound_loop 0, Music_PokemonTower_branch_7f0ee Music_PokemonTower_Ch3:: vibrato 4, 1, 1 - notetype 12, 1, 3 + note_type 12, 1, 3 rest 8 octave 5 - G_ 8 + note G_, 8 Music_PokemonTower_branch_7f1a2:: - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - E_ 1 - D# 1 - F# 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note E_, 1 rest 7 - G_ 1 + note G_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - E_ 1 - D# 1 + note E_, 1 + note D#, 1 octave 4 - B_ 1 + note B_, 1 rest 5 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 octave 4 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 - B_ 1 + note B_, 1 rest 7 octave 5 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - C_ 1 + note C_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - D_ 1 + note D_, 1 rest 7 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 7 - E_ 1 + note E_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F_ 1 + note F_, 1 rest 7 - F# 1 + note F#, 1 rest 7 - F# 1 + note F#, 1 rest 7 - G_ 1 + note G_, 1 rest 15 - notetype 12, 1, 5 + note_type 12, 1, 5 octave 4 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 15 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 7 - notetype 12, 1, 3 + note_type 12, 1, 3 octave 6 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 15 - E_ 1 + note E_, 1 rest 7 octave 5 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_PokemonTower_branch_7f1a2 + sound_loop 0, Music_PokemonTower_branch_7f1a2 diff --git a/audio/music/printer.asm b/audio/music/printer.asm index 853aa290..4466db5b 100755 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -1,316 +1,316 @@ -Music_GBPrinter_Ch3: +Music_GBPrinter_Ch3:: tempo 256 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 6 + note B_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 6 + note B_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 -.loop: - E_ 1 +.loop + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 - C_ 1 - C# 1 + note C#, 1 + note C_, 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note E_, 1 rest 1 octave 4 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, .loop + sound_loop 0, .loop diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm index bab18261..cdefb6ee 100644 --- a/audio/music/routes1.asm +++ b/audio/music/routes1.asm @@ -2,403 +2,403 @@ Music_Routes1_Ch1:: tempo 152 volume 7, 7 vibrato 4, 2, 3 - duty 2 - toggleperfectpitch + duty_cycle 2 + toggle_perfect_pitch Music_Routes1_branch_9be9:: - notetype 12, 10, 1 + note_type 12, 10, 1 rest 4 octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - C# 1 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note C#, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 + note C#, 1 octave 3 - A_ 2 - A_ 2 - A_ 6 - octave 4 - C# 2 - C# 6 - C# 2 - C# 4 + note A_, 2 + note A_, 2 + note A_, 6 + octave 4 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 octave 3 - A_ 2 + note A_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 2 - A_ 6 - octave 4 - D_ 2 - D_ 6 - D_ 2 - D_ 6 - D_ 2 - D_ 1 - E_ 1 - D_ 1 - C# 1 + 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 octave 3 - B_ 2 - A_ 2 - A_ 6 + note B_, 2 + note A_, 2 + note A_, 6 octave 4 - C# 2 - C# 6 + note C#, 2 + note C#, 6 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 - notetype 12, 10, 2 + note A_, 2 + note_type 12, 10, 2 octave 4 - G_ 4 - E_ 4 - F# 2 - notetype 12, 10, 1 + note G_, 4 + note E_, 4 + note F#, 2 + note_type 12, 10, 1 octave 3 - A_ 2 - A_ 6 - A_ 2 - F# 2 - A_ 4 - B_ 2 - octave 4 - C# 2 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 + octave 4 + note C#, 2 octave 3 - B_ 4 - A_ 2 - F# 2 - A_ 4 - G_ 2 - E_ 2 - C# 4 - A_ 2 - octave 4 - D_ 2 + 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 octave 3 - A_ 4 - B_ 2 - G_ 2 - B_ 4 - octave 4 - D_ 2 - E_ 2 - C# 2 - D_ 2 + 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 octave 3 - A_ 2 - A_ 2 - loopchannel 0, Music_Routes1_branch_9be9 - endchannel + note A_, 2 + note A_, 2 + sound_loop 0, Music_Routes1_branch_9be9 + sound_ret Music_Routes1_Ch2:: - duty 2 + duty_cycle 2 Music_Routes1_branch_9c53:: - notetype 12, 13, 1 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c78 - callchannel Music_Routes1_branch_9c65 - callchannel Music_Routes1_branch_9c8d - loopchannel 0, Music_Routes1_branch_9c53 + note_type 12, 13, 1 + sound_call Music_Routes1_branch_9c65 + sound_call Music_Routes1_branch_9c78 + sound_call Music_Routes1_branch_9c65 + sound_call Music_Routes1_branch_9c8d + sound_loop 0, Music_Routes1_branch_9c53 Music_Routes1_branch_9c65:: octave 4 - 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 + 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 + sound_ret Music_Routes1_branch_9c78:: - 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 + 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 + sound_ret Music_Routes1_branch_9c8d:: - C# 1 - D_ 1 - E_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - C# 2 + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - notetype 12, 13, 2 - B_ 4 - notetype 6, 13, 1 + note C#, 2 + note_type 12, 13, 2 + note B_, 4 + note_type 6, 13, 1 octave 3 - B_ 1 + note B_, 1 octave 4 - C# 1 - notetype 12, 13, 1 + note C#, 1 + note_type 12, 13, 1 octave 3 - B_ 1 - A_ 1 - octave 4 - C# 1 - D_ 6 - notetype 12, 13, 2 - F# 1 - G_ 1 - A_ 2 - A_ 2 - F# 2 - D_ 2 + note B_, 1 + note A_, 1 + octave 4 + note C#, 1 + note D_, 6 + note_type 12, 13, 2 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 octave 5 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 4 - B_ 2 + note B_, 2 octave 5 - 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 + 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 octave 5 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 4 - B_ 3 - G_ 1 - A_ 2 + note B_, 3 + note G_, 1 + note A_, 2 octave 5 - D_ 2 - C# 2 - E_ 2 - D_ 2 - notetype 12, 13, 1 - octave 4 - D_ 2 - D_ 2 - endchannel - endchannel + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note_type 12, 13, 1 + octave 4 + note D_, 2 + note D_, 2 + sound_ret + sound_ret Music_Routes1_Ch3:: vibrato 8, 2, 5 - notetype 12, 1, 3 + note_type 12, 1, 3 Music_Routes1_branch_9cdd:: rest 2 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C_ 4 - C# 4 + note C_, 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 - B_ 4 - A_ 4 + note A_, 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 4 + note D_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - D_ 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - C# 8 - D_ 8 + note C#, 8 + note D_, 8 octave 3 - G_ 8 - A_ 8 + note G_, 8 + note A_, 8 octave 4 - D_ 6 - loopchannel 0, Music_Routes1_branch_9cdd - endchannel + note D_, 6 + sound_loop 0, Music_Routes1_branch_9cdd + sound_ret Music_Routes1_Ch4:: - dspeed 12 + drum_speed 12 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 rest 4 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - mutedsnare1 2 + drum_note 15, 2 + drum_note 15, 2 + drum_note 15, 2 rest 2 - mutedsnare1 2 - mutedsnare1 2 - loopchannel 0, Music_Routes1_Ch4 - endchannel + drum_note 15, 2 + drum_note 15, 2 + sound_loop 0, Music_Routes1_Ch4 + sound_ret diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm index 42b4deda..e6782df3 100644 --- a/audio/music/routes2.asm +++ b/audio/music/routes2.asm @@ -2,424 +2,424 @@ Music_Routes2_Ch1:: tempo 152 volume 7, 7 vibrato 9, 2, 5 - duty 1 + duty_cycle 1 Music_Routes2_branch_9dc3:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 2 - B_ 4 - octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - E_ 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - F# 4 + note E_, 2 + note A_, 2 + note G#, 4 + note F#, 4 octave 2 - B_ 4 - octave 3 - G# 6 - F# 2 - E_ 2 - D# 1 - F# 1 - B_ 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note B_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 - A_ 2 - G# 4 - B_ 4 - notetype 8, 11, 2 + note E_, 2 + note A_, 2 + note G#, 4 + note B_, 4 + note_type 8, 11, 2 octave 4 - E_ 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - E_ 2 - D# 2 + note E_, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - D# 2 + note D#, 2 + note D#, 2 octave 3 - G# 2 + note G#, 2 octave 4 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - C# 2 - C# 2 + note C#, 2 + note C#, 2 octave 3 - F# 2 + note F#, 2 octave 4 - 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 + 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 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 - D_ 2 + note C#, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - D_ 2 - F# 2 - E_ 2 - D# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - E_ 2 - loopchannel 0, Music_Routes2_branch_9dc3 - endchannel + note E_, 2 + sound_loop 0, Music_Routes2_branch_9dc3 + sound_ret Music_Routes2_Ch2:: vibrato 8, 2, 6 - duty 3 + duty_cycle 3 Music_Routes2_branch_9e54:: - notetype 12, 13, 4 + note_type 12, 13, 4 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - F# 8 - octave 3 - D# 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 + octave 3 + note D#, 4 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 1 + note B_, 1 octave 4 - E_ 1 - F# 6 - A_ 2 - G# 3 - E_ 1 - B_ 8 - octave 3 - G# 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 + octave 3 + note G#, 4 octave 5 - C# 6 + note C#, 6 octave 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 + 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 octave 5 - C# 4 + note C#, 4 octave 4 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 rest 4 - loopchannel 0, Music_Routes2_branch_9e54 - endchannel + sound_loop 0, Music_Routes2_branch_9e54 + sound_ret Music_Routes2_Ch3:: vibrato 9, 2, 8 Music_Routes2_branch_9e9e:: - notetype 12, 1, 1 + note_type 12, 1, 1 octave 3 - E_ 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 + note D_, 1 + note C#, 1 octave 2 - A_ 2 + note A_, 2 octave 3 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 rest 2 octave 2 - B_ 6 + note B_, 6 octave 3 - D_ 1 - C# 1 - D_ 2 - D# 2 - E_ 2 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 rest 2 octave 2 - B_ 4 + note B_, 4 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 - F# 2 - E_ 2 + note D_, 2 + note F#, 2 + note E_, 2 rest 2 octave 2 - A_ 2 + note A_, 2 rest 2 octave 3 - D# 2 + note D#, 2 rest 2 octave 2 - G# 2 + note G#, 2 rest 2 octave 3 - C# 2 + note C#, 2 rest 2 octave 2 - F# 2 + note F#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - E_ 2 - G# 2 - F# 2 + note E_, 2 + note G#, 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - F# 2 + note F#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 octave 3 - C# 2 + note C#, 2 rest 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C# 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 rest 2 octave 3 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - loopchannel 0, Music_Routes2_branch_9e9e - endchannel + sound_loop 0, Music_Routes2_branch_9e9e + sound_ret Music_Routes2_Ch4:: - dspeed 12 - snare3 2 + drum_speed 12 + drum_note 3, 2 rest 2 - snare3 1 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - dspeed 12 - snare3 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_speed 12 + drum_note 3, 1 rest 3 - snare3 2 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 - rest 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 - snare3 3 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + rest 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 3 - snare3 2 + drum_note 3, 2 rest 2 - snare3 2 + drum_note 3, 2 rest 4 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - snare3 3 - snare3 3 - snare3 3 + drum_note 3, 3 + drum_note 3, 3 + drum_note 3, 3 rest 3 - dspeed 12 - snare3 1 + drum_speed 12 + drum_note 3, 1 rest 5 - snare3 1 - snare3 1 - snare3 2 - snare3 2 - snare3 2 - rest 2 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + rest 2 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 3 rest 3 - snare3 3 + drum_note 3, 3 rest 3 - loopchannel 0, Music_Routes2_Ch4 - endchannel + sound_loop 0, Music_Routes2_Ch4 + sound_ret diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm index d0d1672e..26a41590 100644 --- a/audio/music/routes3.asm +++ b/audio/music/routes3.asm @@ -1,515 +1,515 @@ Music_Routes3_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 octave 3 - E_ 1 - F# 1 - G_ 6 - F_ 1 - G_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G_, 6 + note F_, 1 + note G_, 1 + note E_, 1 rest 16 rest 15 Music_Routes3_branch_9fc3:: - notetype 12, 11, 5 - 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 - A# 8 - F_ 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - 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 - A# 8 - A# 8 - D_ 8 - F_ 8 - notetype 12, 11, 5 - E_ 4 - E_ 2 - F_ 2 - G_ 4 - F_ 2 - E_ 2 - B_ 2 + note_type 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 + note_type 12, 10, 7 + note A#, 8 + note F_, 8 + note D_, 8 + note F_, 8 + note_type 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 + note_type 12, 10, 7 + note A#, 8 + note A#, 8 + note D_, 8 + note F_, 8 + note_type 12, 11, 5 + note E_, 4 + note E_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note B_, 2 octave 2 - G_ 4 + note G_, 4 octave 3 - B_ 8 - A_ 2 - notetype 8, 12, 3 - A_ 4 - F_ 4 - A_ 4 - notetype 8, 4, 15 - A_ 12 - notetype 8, 9, 0 - F_ 12 - G_ 12 - loopchannel 0, Music_Routes3_branch_9fc3 + note B_, 8 + note A_, 2 + note_type 8, 12, 3 + note A_, 4 + note F_, 4 + note A_, 4 + note_type 8, 4, -7 + note A_, 12 + note_type 8, 9, 0 + note F_, 12 + note G_, 12 + sound_loop 0, Music_Routes3_branch_9fc3 Music_Routes3_Ch2:: vibrato 8, 2, 3 - duty 2 - notetype 12, 12, 7 + duty_cycle 2 + note_type 12, 12, 7 octave 3 - G_ 1 - A# 1 - B_ 6 - A_ 1 - B_ 1 + note G_, 1 + note A#, 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C_ 1 + note C_, 1 rest 15 rest 16 Music_Routes3_branch_a01a:: - notetype 12, 12, 7 - duty 2 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 - A_ 8 - notetype 12, 12, 7 - duty 2 + note A#, 8 + note A_, 8 + note_type 12, 12, 7 + duty_cycle 2 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 1 + note G_, 1 octave 4 - C_ 1 - E_ 10 + note C_, 1 + note E_, 10 octave 3 - G_ 2 + note G_, 2 octave 4 - C_ 2 - G_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - D_ 8 - F_ 8 - notetype 12, 12, 5 - duty 3 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + note_type 12, 12, 5 + duty_cycle 3 octave 3 - A# 8 + note A#, 8 octave 4 - D_ 6 - notetype 12, 12, 7 - duty 2 - C_ 1 - D_ 1 - E_ 2 - D_ 2 - E_ 2 - C_ 8 + note D_, 6 + note_type 12, 12, 7 + duty_cycle 2 + note C_, 1 + note D_, 1 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 8 octave 3 - B_ 1 + note B_, 1 octave 4 - C_ 1 - D_ 2 + note C_, 1 + note D_, 2 octave 3 - G_ 4 + note G_, 4 octave 4 - G_ 8 - F_ 1 - E_ 1 - notetype 8, 13, 3 - F_ 4 - E_ 4 - notetype 8, 12, 4 - C_ 4 - notetype 8, 12, 5 - C_ 12 - notetype 12, 10, 0 - duty 3 + note G_, 8 + note F_, 1 + note E_, 1 + note_type 8, 13, 3 + note F_, 4 + note E_, 4 + note_type 8, 12, 4 + note C_, 4 + note_type 8, 12, 5 + note C_, 12 + note_type 12, 10, 0 + duty_cycle 3 octave 3 - A_ 8 - B_ 8 - loopchannel 0, Music_Routes3_branch_a01a + note A_, 8 + note B_, 8 + sound_loop 0, Music_Routes3_branch_a01a Music_Routes3_Ch3:: vibrato 4, 1, 0 - notetype 6, 1, 2 + note_type 6, 1, 2 octave 4 - G_ 2 - A# 2 - B_ 8 - A_ 8 - G_ 2 + note G_, 2 + note A#, 2 + note B_, 8 + note A_, 8 + note G_, 2 rest 2 - G_ 7 + note G_, 7 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - G_ 8 - G_ 2 + note G_, 8 + note G_, 2 rest 2 - G_ 7 + note G_, 7 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - G_ 8 + note G_, 8 Music_Routes3_branch_a0a3:: - notetype 12, 1, 2 - E_ 1 + note_type 12, 1, 2 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 4 - E_ 1 + note G_, 4 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 2 - A_ 2 - F_ 1 + note G_, 2 + note A_, 2 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 4 - F_ 1 + note A#, 4 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 2 - F_ 2 - E_ 1 + note A#, 2 + note F_, 2 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 4 - E_ 1 + note G_, 4 + note E_, 1 rest 1 - G_ 4 - E_ 1 - E_ 1 - E_ 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 2 - A_ 2 - F_ 1 + note G_, 2 + note A_, 2 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 4 - F_ 1 + note A#, 4 + note F_, 1 rest 1 - A# 4 - F_ 1 - F_ 1 - F_ 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A# 2 - A_ 2 - G_ 1 + note A#, 2 + note A_, 2 + note G_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 4 + note D_, 4 octave 4 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 octave 5 - D_ 4 + note D_, 4 octave 4 - F_ 1 + note F_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - F_ 1 - F_ 1 - F_ 1 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 octave 5 - C_ 4 + note C_, 4 octave 4 - F_ 1 + note F_, 1 rest 1 - A_ 4 - F_ 1 - F_ 1 - F_ 1 + note A_, 4 + note F_, 1 + note F_, 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - A_ 4 - loopchannel 0, Music_Routes3_branch_a0a3 + note A_, 4 + sound_loop 0, Music_Routes3_branch_a0a3 Music_Routes3_Ch4:: - dspeed 6 - 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 + drum_speed 6 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 18, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes3_branch_a17a:: - 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 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 18, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 19, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 10 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 18, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 8 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 12 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 4 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + sound_loop 0, Music_Routes3_branch_a17a diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm index 9bbf44ea..50679f54 100644 --- a/audio/music/routes4.asm +++ b/audio/music/routes4.asm @@ -1,681 +1,681 @@ Music_Routes4_Ch1:: tempo 148 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 10, 3, 4 - toggleperfectpitch - notetype 12, 10, 2 + toggle_perfect_pitch + note_type 12, 10, 2 octave 2 - G# 4 - G# 4 - G# 4 - notetype 12, 7, 15 - G# 4 - notetype 12, 10, 2 - G# 4 - G# 4 - G# 4 - notetype 12, 11, 7 - B_ 1 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 7, -7 + note G#, 4 + note_type 12, 10, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note_type 12, 11, 7 + note B_, 1 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 Music_Routes4_branch_a28a:: - notetype 12, 11, 7 - B_ 6 - E_ 2 - E_ 4 + note_type 12, 11, 7 + note B_, 6 + note E_, 2 + note E_, 4 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - notetype 12, 11, 1 - G# 3 - notetype 12, 11, 7 - E_ 1 - F# 12 - E_ 8 - D# 4 - F# 4 - B_ 6 - E_ 2 - E_ 4 + note B_, 4 + note A_, 4 + note_type 12, 11, 1 + note G#, 3 + note_type 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 octave 4 - E_ 4 - D_ 4 - C# 4 + note E_, 4 + note D_, 4 + note C#, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C# 4 - notetype 12, 11, 1 - E_ 3 - notetype 12, 11, 7 - D# 1 - E_ 12 + note C#, 4 + note_type 12, 11, 1 + note E_, 3 + note_type 12, 11, 7 + note D#, 1 + note E_, 12 octave 3 - B_ 3 - A_ 1 - G# 8 + note B_, 3 + note A_, 1 + note G#, 8 octave 4 - E_ 4 + note E_, 4 octave 3 - D_ 2 - E_ 2 - F# 2 - G# 2 - A_ 2 - B_ 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 octave 4 - C# 2 - D_ 2 - D_ 2 + note C#, 2 + note D_, 2 + note D_, 2 octave 3 - 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 + 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 octave 4 - D# 2 - E_ 2 + note D#, 2 + note E_, 2 octave 3 - B_ 2 - G# 2 - F# 2 - E_ 2 - F# 2 - G# 2 - B_ 2 - notetype 8, 11, 5 - A_ 4 - G# 4 - F# 4 + note B_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note_type 8, 11, 5 + note A_, 4 + note G#, 4 + note F#, 4 octave 4 - E_ 4 - D# 4 - C# 4 - C# 4 + note E_, 4 + note D#, 4 + note C#, 4 + note C#, 4 octave 3 - B_ 4 - A_ 4 - B_ 4 + note B_, 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 - D# 4 + note C#, 4 + note D#, 4 octave 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - B_ 4 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 4 octave 4 - C# 4 - D# 4 - E_ 3 + note C#, 4 + note D#, 4 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - A_ 3 - loopchannel 0, Music_Routes4_branch_a28a + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + sound_loop 0, Music_Routes4_branch_a28a Music_Routes4_Ch2:: vibrato 12, 2, 4 - duty 1 - notetype 12, 9, 2 + duty_cycle 1 + note_type 12, 9, 2 octave 3 - E_ 3 - F# 1 - notetype 12, 9, 0 - E_ 12 - notetype 12, 9, 2 + note E_, 3 + note F#, 1 + note_type 12, 9, 0 + note E_, 12 + note_type 12, 9, 2 octave 2 - B_ 3 + note B_, 3 octave 3 - C_ 1 - notetype 12, 9, 0 + note C_, 1 + note_type 12, 9, 0 octave 2 - B_ 8 - duty 3 - notetype 12, 12, 7 + note B_, 8 + duty_cycle 3 + note_type 12, 12, 7 octave 3 - E_ 1 - F# 1 - B_ 1 + note E_, 1 + note F#, 1 + note B_, 1 octave 4 - D# 1 + note D#, 1 Music_Routes4_branch_a325:: - notetype 12, 12, 7 - E_ 6 + note_type 12, 12, 7 + note E_, 6 octave 3 - B_ 2 - B_ 4 + note B_, 2 + note B_, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - F# 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - G# 3 - E_ 1 - notetype 12, 10, 0 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note_type 12, 12, 2 + note G#, 3 + note E_, 1 + note_type 12, 10, 0 octave 3 - B_ 12 - duty 0 - notetype 12, 12, 2 + note B_, 12 + duty_cycle 0 + note_type 12, 12, 2 octave 2 - B_ 3 - notetype 12, 12, 7 + note B_, 3 + note_type 12, 12, 7 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 8 + note B_, 8 octave 3 - D# 4 - duty 3 + note D#, 4 + duty_cycle 3 octave 4 - E_ 6 + note E_, 6 octave 3 - B_ 2 - B_ 4 + note B_, 2 + note B_, 4 octave 4 - B_ 4 - A_ 4 - G# 4 - F# 4 - A_ 1 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 1 octave 5 - C# 1 + note C#, 1 octave 4 - B_ 1 - A_ 1 - notetype 12, 12, 2 - B_ 3 - notetype 12, 12, 7 - A_ 1 - notetype 12, 11, 0 - G# 6 - notetype 12, 9, 0 - G# 6 - notetype 12, 7, 0 - G# 6 - notetype 12, 6, 15 - G# 6 - notetype 12, 12, 7 - G# 4 - notetype 8, 12, 3 - A_ 4 - G# 4 - F# 4 - notetype 8, 9, 0 - F# 6 - notetype 8, 7, 15 - F# 6 - duty 0 - notetype 8, 9, 0 + note B_, 1 + note A_, 1 + note_type 12, 12, 2 + note B_, 3 + note_type 12, 12, 7 + note A_, 1 + note_type 12, 11, 0 + note G#, 6 + note_type 12, 9, 0 + note G#, 6 + note_type 12, 7, 0 + note G#, 6 + note_type 12, 6, -7 + note G#, 6 + note_type 12, 12, 7 + note G#, 4 + note_type 8, 12, 3 + note A_, 4 + note G#, 4 + note F#, 4 + note_type 8, 9, 0 + note F#, 6 + note_type 8, 7, -7 + note F#, 6 + duty_cycle 0 + note_type 8, 9, 0 octave 3 - F# 4 - E_ 4 - F# 4 - A_ 6 - duty 3 - notetype 8, 12, 7 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 6 + duty_cycle 3 + note_type 8, 12, 7 octave 4 - F# 6 - G# 4 - F# 4 - notetype 8, 12, 4 - E_ 4 - notetype 8, 10, 0 - E_ 12 - duty 0 - notetype 8, 9, 0 + note F#, 6 + note G#, 4 + note F#, 4 + note_type 8, 12, 4 + note E_, 4 + note_type 8, 10, 0 + note E_, 12 + duty_cycle 0 + note_type 8, 9, 0 octave 3 - E_ 4 - D# 4 - E_ 4 - G# 6 - duty 3 - notetype 8, 12, 7 + note E_, 4 + note D#, 4 + note E_, 4 + note G#, 6 + duty_cycle 3 + note_type 8, 12, 7 octave 4 - E_ 6 - F# 4 - D# 4 + note E_, 6 + note F#, 4 + note D#, 4 octave 3 - B_ 4 - notetype 8, 10, 0 + note B_, 4 + note_type 8, 10, 0 octave 4 - B_ 16 - notetype 8, 10, 7 - B_ 8 - notetype 8, 11, 0 - A_ 6 - notetype 8, 11, 7 - A_ 6 - notetype 12, 10, 7 - G# 1 - F# 1 - notetype 12, 11, 0 - E_ 12 - notetype 12, 10, 0 - E_ 8 - notetype 12, 10, 7 - E_ 10 - loopchannel 0, Music_Routes4_branch_a325 + note B_, 16 + note_type 8, 10, 7 + note B_, 8 + note_type 8, 11, 0 + note A_, 6 + note_type 8, 11, 7 + note A_, 6 + note_type 12, 10, 7 + note G#, 1 + note F#, 1 + note_type 12, 11, 0 + note E_, 12 + note_type 12, 10, 0 + note E_, 8 + note_type 12, 10, 7 + note E_, 10 + sound_loop 0, Music_Routes4_branch_a325 Music_Routes4_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 Music_Routes4_branch_a3d7:: - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - D_ 1 + note D_, 1 rest 3 - D_ 1 - D_ 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 - F# 1 - F# 1 - F# 1 - F# 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 - B_ 1 - B_ 1 - B_ 1 - B_ 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 3 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 - G# 1 - G# 1 - G# 1 - G# 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - E_ 1 - E_ 1 - E_ 1 - E_ 1 - E_ 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 rest 1 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_Routes4_branch_a3d7 + sound_loop 0, Music_Routes4_branch_a3d7 Music_Routes4_Ch4:: - dspeed 12 + drum_speed 12 rest 16 rest 12 - mutedsnare4 1 - mutedsnare4 1 - mutedsnare3 1 - mutedsnare3 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 Music_Routes4_branch_a4a8:: - 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 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 18, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 18, 1 + drum_note 18, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 17, 2 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 19, 1 + drum_note 18, 1 + drum_note 17, 4 + drum_note 19, 1 + drum_note 19, 1 + drum_note 18, 1 + drum_note 18, 1 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + drum_note 17, 2 + sound_loop 0, Music_Routes4_branch_a4a8 diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm index 45d84fd0..0ca2f71a 100644 --- a/audio/music/safarizone.asm +++ b/audio/music/safarizone.asm @@ -2,110 +2,110 @@ Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 - toggleperfectpitch - duty 2 - notetype 12, 9, 2 + toggle_perfect_pitch + duty_cycle 2 + note_type 12, 9, 2 octave 3 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 - pitchbend 0, 73 - C_ 1 - pitchbend 0, 73 - G_ 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 + pitch_slide 1, 4, A_ + note C_, 1 + pitch_slide 1, 4, A_ + note G_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc4f:: - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - callchannel Music_SafariZone_branch_bc5f - notetype 12, 10, 4 - F# 4 - loopchannel 0, Music_SafariZone_branch_bc4f + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_call Music_SafariZone_branch_bc5f + note_type 12, 10, 4 + note F#, 4 + sound_loop 0, Music_SafariZone_branch_bc4f Music_SafariZone_branch_bc5f:: - notetype 12, 10, 2 + note_type 12, 10, 2 octave 3 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - G_ 4 - C_ 4 - endchannel + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + sound_ret Music_SafariZone_Ch2:: - duty 2 + duty_cycle 2 vibrato 8, 2, 5 - notetype 12, 10, 2 + note_type 12, 10, 2 octave 4 - G_ 1 - D_ 1 - G_ 1 - D_ 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 rest 4 - duty 3 + duty_cycle 3 Music_SafariZone_branch_bc79:: - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - A_ 4 - callchannel Music_SafariZone_branch_bc89 - notetype 12, 11, 5 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc79 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note A_, 4 + sound_call Music_SafariZone_branch_bc89 + note_type 12, 11, 5 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc79 Music_SafariZone_branch_bc89:: - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - D_ 4 - G_ 4 - endchannel + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + sound_ret Music_SafariZone_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 8 Music_SafariZone_branch_bc97:: - callchannel Music_SafariZone_branch_bca5 + sound_call Music_SafariZone_branch_bca5 octave 4 - A_ 4 - callchannel Music_SafariZone_branch_bca5 + note A_, 4 + sound_call Music_SafariZone_branch_bca5 octave 4 - B_ 4 - loopchannel 0, Music_SafariZone_branch_bc97 + note B_, 4 + sound_loop 0, Music_SafariZone_branch_bc97 Music_SafariZone_branch_bca5:: octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 octave 4 - D_ 2 + note D_, 2 rest 2 octave 3 - A_ 2 + note A_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm index 2b6d8134..3c7512ba 100644 --- a/audio/music/silphco.asm +++ b/audio/music/silphco.asm @@ -1,323 +1,323 @@ Music_SilphCo_Ch1:: tempo 160 volume 7, 7 - duty 3 - toggleperfectpitch + duty_cycle 3 + toggle_perfect_pitch vibrato 8, 2, 2 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - E_ 1 - F# 1 - G# 1 - A# 1 - octave 3 - C_ 1 - notetype 6, 10, 0 - C_ 12 - notetype 6, 11, 3 - C_ 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + note_type 6, 10, 0 + note C_, 12 + note_type 6, 11, 3 + note C_, 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 Music_SilphCo_branch_7f26d:: - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 octave 3 - C_ 2 + note C_, 2 rest 2 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 10 - E_ 1 - F# 1 - G# 1 - A_ 1 - notetype 6, 10, 0 - B_ 12 - notetype 6, 11, 3 - B_ 1 - A_ 1 - G_ 1 - F_ 1 - E_ 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note_type 6, 10, 0 + note B_, 12 + note_type 6, 11, 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 - octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 + octave 3 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - A_ 1 - G_ 1 - F_ 1 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 rest 11 - F# 1 - B_ 1 - octave 3 - C_ 1 - C# 1 - notetype 6, 10, 0 - D_ 12 - notetype 6, 11, 3 - D_ 1 - C_ 1 + note F#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note_type 6, 10, 0 + note D_, 12 + note_type 6, 11, 3 + note D_, 1 + note C_, 1 octave 2 - A# 1 - G_ 1 - F_ 1 + note A#, 1 + note G_, 1 + note F_, 1 rest 11 - F_ 1 - G# 1 - A# 1 - B_ 1 - notetype 6, 10, 0 - octave 3 - C_ 12 - notetype 6, 11, 3 - C_ 1 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note_type 6, 10, 0 + octave 3 + note C_, 12 + note_type 6, 11, 3 + note C_, 1 octave 2 - B_ 1 - G# 1 - F_ 1 - E_ 1 + note B_, 1 + note G#, 1 + note F_, 1 + note E_, 1 rest 7 - notetype 6, 8, 0 - B_ 16 - notetype 6, 11, 0 + note_type 6, 8, 0 + note B_, 16 + note_type 6, 11, 0 octave 3 - E_ 8 + note E_, 8 tempo 124 - notetype 6, 11, 3 + note_type 6, 11, 3 octave 2 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 10 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 16 rest 6 - A_ 2 + note A_, 2 rest 6 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 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 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 + sound_call Music_SilphCo_branch_7f3f0 rest 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A_ 2 + note A_, 2 rest 6 - A# 2 + note A#, 2 rest 6 - A# 2 + note A#, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 3 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - C_ 2 + note C_, 2 rest 6 - C_ 2 + note C_, 2 rest 6 octave 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 octave 4 - E_ 2 + note E_, 2 rest 6 - E_ 2 + note E_, 2 rest 6 - D# 2 + note D#, 2 rest 6 - D# 2 + note D#, 2 rest 2 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 6, 0 - E_ 16 - E_ 11 - notetype 6, 11, 3 - E_ 1 - F# 1 - G# 1 - A# 1 - octave 3 - C_ 1 - notetype 6, 3, 15 - C_ 16 - notetype 6, 10, 0 - C_ 11 - notetype 6, 9, 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 6, 0 + note E_, 16 + note E_, 11 + note_type 6, 11, 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + note_type 6, 3, -7 + note C_, 16 + note_type 6, 10, 0 + note C_, 11 + note_type 6, 9, 3 octave 2 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - notetype 6, 3, 15 - E_ 16 - notetype 6, 9, 0 - E_ 11 - notetype 6, 11, 3 - F_ 1 - G_ 1 - A# 1 - octave 3 - C_ 1 - D_ 1 - notetype 6, 3, 15 - D_ 16 - notetype 6, 10, 7 - D_ 11 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note_type 6, 3, -7 + note E_, 16 + note_type 6, 9, 0 + note E_, 11 + note_type 6, 11, 3 + note F_, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note_type 6, 3, -7 + note D_, 16 + note_type 6, 10, 7 + note D_, 11 rest 4 rest 4 tempo 128 @@ -344,633 +344,633 @@ Music_SilphCo_branch_7f26d:: rest 4 tempo 160 rest 4 - notetype 6, 4, 3 + note_type 6, 4, 3 octave 2 - B_ 2 + note B_, 2 rest 6 - notetype 6, 6, 3 - B_ 2 + note_type 6, 6, 3 + note B_, 2 rest 6 - notetype 6, 8, 3 - B_ 2 + note_type 6, 8, 3 + note B_, 2 rest 6 - notetype 6, 5, 0 - B_ 8 - notetype 6, 11, 3 - B_ 2 + note_type 6, 5, 0 + note B_, 8 + note_type 6, 11, 3 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f26d + sound_loop 0, Music_SilphCo_branch_7f26d Music_SilphCo_branch_7f3f0:: octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 3 - C_ 2 - endchannel + note C_, 2 + sound_ret Music_SilphCo_Ch2:: vibrato 10, 3, 2 - duty 3 - notetype 6, 12, 3 + duty_cycle 3 + note_type 6, 12, 3 octave 3 - E_ 1 - F# 1 - G# 1 - A# 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 octave 4 - C_ 1 - notetype 6, 11, 0 - C_ 12 - notetype 6, 12, 3 - C_ 2 - octave 3 - B_ 1 - A# 1 - G# 1 - F# 1 - E_ 1 - E_ 2 + note C_, 1 + note_type 6, 11, 0 + note C_, 12 + note_type 6, 12, 3 + note C_, 2 + octave 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 rest 2 octave 2 - G_ 2 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 Music_SilphCo_branch_7f42e:: - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 2 - notetype 6, 11, 7 - duty 2 + note_type 6, 11, 7 + duty_cycle 2 octave 4 - 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 - E_ 16 - notetype 6, 12, 0 - B_ 16 - notetype 6, 12, 4 - octave 3 - 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 + 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 + duty_cycle 3 + note_type 6, 6, -7 + note E_, 16 + note_type 6, 12, 0 + note B_, 16 + note_type 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 + note_type 6, 12, 2 + duty_cycle 1 octave 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 - F_ 4 - F# 4 - G_ 4 - G# 4 - D# 4 - D_ 4 - D# 4 - E_ 4 - D# 4 - E_ 4 - notetype 6, 12, 0 - F_ 8 - notetype 6, 11, 7 - F_ 8 - notetype 6, 8, 10 - F_ 4 - notetype 6, 12, 4 - duty 3 - F_ 4 - E_ 4 - F_ 4 - notetype 6, 10, 0 - F# 8 - notetype 6, 11, 0 - F# 8 - notetype 6, 9, 9 - F# 4 - notetype 6, 12, 4 - F# 4 - F_ 4 - F# 4 - notetype 6, 9, 0 - G_ 12 - notetype 6, 5, 9 - G_ 8 - notetype 6, 12, 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 - F_ 4 - F# 4 - G_ 4 - G# 4 - A_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - A# 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 4 - B_ 4 - notetype 6, 11, 4 - duty 3 - D# 4 - D_ 4 - D# 4 - notetype 6, 12, 2 - duty 1 - F_ 4 - F# 4 - G_ 4 - G# 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 + note_type 6, 12, 4 + duty_cycle 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 + note_type 6, 12, 0 + note F_, 8 + note_type 6, 11, 7 + note F_, 8 + note_type 6, 8, -2 + note F_, 4 + note_type 6, 12, 4 + duty_cycle 3 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 6, 10, 0 + note F#, 8 + note_type 6, 11, 0 + note F#, 8 + note_type 6, 9, -1 + note F#, 4 + note_type 6, 12, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note_type 6, 9, 0 + note G_, 12 + note_type 6, 5, -1 + note G_, 8 + note_type 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 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note B_, 4 + note_type 6, 11, 4 + duty_cycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + note_type 6, 12, 2 + duty_cycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 octave 4 - C_ 4 - notetype 6, 11, 4 - duty 3 + note C_, 4 + note_type 6, 11, 4 + duty_cycle 3 octave 3 - D# 4 - D_ 4 - D# 4 + note D#, 4 + note D_, 4 + note D#, 4 rest 4 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 2 - duty 0 + duty_cycle 0 octave 4 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - G# 2 + note G#, 2 rest 6 - duty 3 + duty_cycle 3 octave 3 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G_ 2 + note G_, 2 rest 2 - duty 0 + duty_cycle 0 octave 4 - E_ 2 + note E_, 2 rest 2 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 2 - duty 3 + duty_cycle 3 octave 3 - G_ 2 + note G_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 - G_ 2 + note G_, 2 rest 2 octave 4 - C_ 2 + note C_, 2 rest 2 octave 3 - G_ 2 + note G_, 2 rest 2 - notetype 6, 8, 7 + note_type 6, 8, 7 octave 5 - 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 + 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 + rest 4 + note_type 6, 4, 3 octave 2 - G_ 2 + note G_, 2 rest 6 - notetype 6, 6, 3 - F# 2 + note_type 6, 6, 3 + note F#, 2 rest 6 - notetype 6, 8, 3 - G_ 2 + note_type 6, 8, 3 + note G_, 2 rest 6 - notetype 6, 4, 15 - G# 8 - notetype 6, 11, 4 - G_ 2 + note_type 6, 4, -7 + note G#, 8 + note_type 6, 11, 4 + note G_, 2 rest 6 - F# 2 + note F#, 2 rest 6 - G_ 2 + note G_, 2 rest 6 - G# 2 + note G#, 2 rest 2 - loopchannel 0, Music_SilphCo_branch_7f42e + sound_loop 0, Music_SilphCo_branch_7f42e Music_SilphCo_Ch3:: vibrato 8, 1, 1 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 12 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 Music_SilphCo_branch_7f5c9:: - 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 + 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 rest 1 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 5 - F_ 1 + note F_, 1 rest 5 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 11 - D# 1 + note D#, 1 rest 3 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F# 1 + note F#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - F# 1 + note F#, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - F_ 1 + note F_, 1 rest 3 - E_ 1 + note E_, 1 rest 3 - D# 1 + note D#, 1 rest 3 - D_ 1 + note D_, 1 rest 1 - D_ 8 - F_ 8 - D_ 8 - F# 8 - D_ 8 - G_ 8 - D_ 8 - A_ 8 - E_ 4 - D# 4 - E_ 4 - F_ 4 + 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 octave 5 - E_ 2 - D# 2 - E_ 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 4 - E_ 4 - D# 4 - E_ 4 - F_ 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 octave 5 - E_ 2 - F_ 2 - F# 2 - G_ 2 - G# 2 - D# 2 - D_ 2 - D# 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 octave 6 - 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 + 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 + note_type 6, 1, 1 rest 4 rest 4 rest 4 @@ -987,14 +987,14 @@ Music_SilphCo_branch_7f5c9:: rest 4 rest 4 rest 4 - notetype 12, 1, 1 + note_type 12, 1, 1 rest 4 rest 4 rest 4 rest 4 octave 5 - E_ 4 - D# 4 - E_ 4 - F_ 4 - loopchannel 0, Music_SilphCo_branch_7f5c9 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + sound_loop 0, Music_SilphCo_branch_7f5c9 diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm index ea6b1a0f..4dae83bc 100644 --- a/audio/music/ssanne.asm +++ b/audio/music/ssanne.asm @@ -1,338 +1,338 @@ Music_SSAnne_Ch1:: tempo 128 volume 7, 7 - duty 1 + duty_cycle 1 vibrato 8, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_SSAnne_branch_b3b2:: - notetype 12, 10, 4 + note_type 12, 10, 4 rest 12 octave 3 - E_ 2 - F# 2 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + note E_, 2 + note F#, 2 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 rest 4 - E_ 4 - G# 4 + note E_, 4 + note G#, 4 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + 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 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 4 - E_ 4 - F# 4 + 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 rest 4 - C# 2 - E_ 2 - F# 4 - D_ 4 - E_ 4 - D_ 4 - C# 2 - D_ 2 - E_ 2 + 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 rest 2 - E_ 4 - F# 2 - D_ 2 - E_ 4 - F# 4 - G# 4 - F# 8 - G# 4 - E_ 4 + 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 rest 4 - E_ 4 - F# 2 - E_ 2 - D_ 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D_, 4 rest 4 - D_ 4 - E_ 4 - C# 4 + note D_, 4 + note E_, 4 + note C#, 4 rest 4 - C# 4 - D_ 2 - C# 2 + note C#, 4 + note D_, 2 + note C#, 2 octave 2 - B_ 4 - E_ 4 - B_ 4 + note B_, 4 + note E_, 4 + note B_, 4 octave 3 - D_ 2 + note D_, 2 octave 2 - B_ 2 - A_ 4 + note B_, 2 + note A_, 4 rest 4 - A_ 4 - B_ 2 - A_ 2 - G# 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 4 rest 4 - C# 4 - G# 4 - A_ 4 + note C#, 4 + note G#, 4 + note A_, 4 rest 4 - A_ 4 - B_ 4 - B_ 4 + note A_, 4 + note B_, 4 + note B_, 4 rest 4 octave 3 - D_ 8 - loopchannel 0, Music_SSAnne_branch_b3b2 + note D_, 8 + sound_loop 0, Music_SSAnne_branch_b3b2 Music_SSAnne_Ch2:: - duty 0 + duty_cycle 0 vibrato 12, 2, 4 Music_SSAnne_branch_b41e:: - notetype 12, 12, 5 + note_type 12, 12, 5 octave 3 - A_ 2 - E_ 2 - A_ 4 - B_ 4 + note A_, 2 + note E_, 2 + note A_, 4 + note B_, 4 octave 4 - D_ 4 - notetype 8, 12, 5 - C# 2 - D_ 2 - C# 2 + note D_, 4 + note_type 8, 12, 5 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 - A_ 3 - E_ 3 - A_ 6 - B_ 6 + note B_, 3 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 12 - A_ 3 - E_ 3 - A_ 6 - B_ 6 + note B_, 12 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 octave 4 - D_ 6 - C# 2 - D_ 2 - C# 2 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 3 - A_ 3 - B_ 6 - G# 6 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 octave 4 - C# 6 - D_ 6 - C# 3 + note C#, 6 + note D_, 6 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 6 - D_ 3 - C# 3 + note E_, 6 + note D_, 3 + note C#, 3 octave 3 - B_ 12 + note B_, 12 rest 3 octave 4 - C# 3 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - C# 3 - C# 3 - D_ 3 - C# 3 - D_ 3 - E_ 3 + note C#, 3 + note C#, 3 + note D_, 3 + note C#, 3 + note D_, 3 + note E_, 3 octave 3 - B_ 3 - G# 3 - F# 3 - E_ 3 - F# 3 - G# 3 - B_ 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 rest 3 - A_ 3 - G# 3 - A_ 3 - A_ 3 - B_ 3 - A_ 3 - B_ 3 + note A_, 3 + note G#, 3 + note A_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note B_, 3 octave 4 - C# 3 + note C#, 3 octave 3 - G# 3 - F# 3 - E_ 3 - E_ 3 - F# 3 - G# 3 - B_ 3 + note G#, 3 + note F#, 3 + note E_, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - F# 3 - G# 3 - A_ 3 - E_ 3 - C# 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 octave 2 - B_ 3 - A_ 3 - B_ 3 + note B_, 3 + note A_, 3 + note B_, 3 octave 3 - C# 3 - E_ 3 + note C#, 3 + note E_, 3 rest 3 - F# 3 - E_ 3 - F# 3 - F# 3 - G# 3 - A_ 3 - B_ 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 3 octave 4 - C# 3 - D_ 3 - C# 3 + note C#, 3 + note D_, 3 + note C#, 3 octave 3 - B_ 3 + note B_, 3 octave 4 - E_ 3 - D_ 3 - C# 3 + note E_, 3 + note D_, 3 + note C#, 3 octave 3 - B_ 3 - loopchannel 0, Music_SSAnne_branch_b41e + note B_, 3 + sound_loop 0, Music_SSAnne_branch_b41e Music_SSAnne_Ch3:: - notetype 12, 1, 3 + note_type 12, 1, 3 rest 16 rest 12 octave 4 - B_ 2 - G# 2 - A_ 8 - F# 8 - G# 4 + note B_, 2 + note G#, 2 + note A_, 8 + note F#, 8 + note G#, 4 rest 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 + 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 octave 5 - D_ 8 - C# 8 - C# 8 + note D_, 8 + note C#, 8 + note C#, 8 octave 4 - 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 + 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 + sound_loop 0, Music_SSAnne_Ch3 diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm index 03ebfed0..4765f391 100644 --- a/audio/music/surfing.asm +++ b/audio/music/surfing.asm @@ -1,335 +1,335 @@ Music_Surfing_Ch1:: tempo 160 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch - notetype 12, 11, 5 + toggle_perfect_pitch + note_type 12, 11, 5 rest 6 octave 2 - A_ 2 - G# 3 - F# 1 - E_ 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 octave 3 - G# 2 - F# 2 - G# 4 + note G#, 2 + note F#, 2 + note G#, 4 Music_Surfing_branch_7fa30:: - notetype 12, 11, 2 - E_ 2 - E_ 4 - E_ 2 - E_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - D_ 2 - D_ 4 - notetype 12, 11, 1 - F# 3 - notetype 12, 11, 2 - 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 - F# 3 - notetype 12, 11, 2 - G# 1 - notetype 12, 11, 4 - A_ 2 - B_ 2 + note_type 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 + note_type 12, 11, 1 + note F#, 3 + note_type 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 + note_type 12, 11, 1 + note F#, 3 + note_type 12, 11, 2 + note G#, 1 + note_type 12, 11, 4 + note A_, 2 + note B_, 2 octave 4 - C_ 2 - notetype 12, 11, 7 - C# 6 - notetype 12, 11, 3 - D_ 2 - C# 2 + note C_, 2 + note_type 12, 11, 7 + note C#, 6 + note_type 12, 11, 3 + note D_, 2 + note C#, 2 octave 3 - 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 + 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 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - 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 + 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 octave 4 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - E_ 4 - loopchannel 0, Music_Surfing_branch_7fa30 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 4 + sound_loop 0, Music_Surfing_branch_7fa30 Music_Surfing_Ch2:: - duty 3 + duty_cycle 3 vibrato 16, 2, 5 - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - A_ 2 - G# 3 - F# 1 - E_ 6 - G# 6 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + note G#, 6 octave 4 - E_ 2 - D_ 2 + note E_, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 Music_Surfing_branch_7faae:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 4 - E_ 6 - C# 5 - E_ 1 - D_ 6 + note E_, 6 + note C#, 5 + note E_, 1 + note D_, 6 octave 3 - B_ 6 + note B_, 6 octave 4 - D_ 6 + note D_, 6 octave 3 - B_ 2 - notetype 12, 12, 1 + note B_, 2 + note_type 12, 12, 1 octave 4 - F# 3 - notetype 12, 12, 6 - D_ 1 - E_ 6 - C# 6 - E_ 6 - C# 5 - E_ 1 - F# 6 - D_ 6 - F# 6 - E_ 2 - notetype 12, 12, 1 - F# 3 - notetype 12, 12, 6 - 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 + note F#, 3 + note_type 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 + note_type 12, 12, 1 + note F#, 3 + note_type 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 octave 3 - B_ 1 + note B_, 1 octave 4 - 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 + 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 octave 5 - C# 6 - loopchannel 0, Music_Surfing_branch_7faae + note C#, 6 + sound_loop 0, Music_Surfing_branch_7faae Music_Surfing_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 rest 12 octave 5 - E_ 6 + note E_, 6 octave 4 - E_ 2 - F# 2 - G# 2 + note E_, 2 + note F#, 2 + note G#, 2 Music_Surfing_branch_7fb03:: octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 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 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 2 - G# 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - G# 1 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 rest 2 - E_ 1 - C# 2 - A_ 2 - A_ 2 - E_ 2 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 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 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - A_ 2 - A_ 2 - D_ 2 - F# 2 - F# 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - F# 2 - F# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - A_ 2 - A_ 2 - E_ 2 - G# 2 - G# 2 + 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 octave 3 - B_ 2 + note B_, 2 octave 4 - G# 2 - G# 2 - E_ 2 - A_ 2 - A_ 2 - C# 2 - D_ 2 - E_ 2 - loopchannel 0, Music_Surfing_branch_7fb03 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + sound_loop 0, Music_Surfing_branch_7fb03 diff --git a/audio/music/surfingpikachu.asm b/audio/music/surfingpikachu.asm index 1ee3f760..8e161443 100644 --- a/audio/music/surfingpikachu.asm +++ b/audio/music/surfingpikachu.asm @@ -1,690 +1,690 @@ Music_SurfingPikachu_Ch1:: tempo 117 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 3 - octave 3 - E_ 6 - notetype 12, 11, 2 - F# 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - F# 16 + note_type 12, 11, 3 + octave 3 + note E_, 6 + note_type 12, 11, 2 + note F#, 2 + note_type 12, 11, 3 + note E_, 6 + note_type 12, 11, 2 + note F#, 16 rest 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 2 - notetype 12, 11, 3 - E_ 6 - notetype 12, 11, 2 - A_ 14 - notetype 12, 11, 2 - D# 2 - C# 1 - D# 1 + note_type 12, 11, 3 + note E_, 6 + note_type 12, 11, 2 + note A_, 2 + note_type 12, 11, 3 + note E_, 6 + note_type 12, 11, 2 + note A_, 14 + note_type 12, 11, 2 + note D#, 2 + note C#, 1 + note D#, 1 octave 2 - B_ 6 - octave 3 - E_ 4 - E_ 4 - E_ 8 - G# 4 - G# 4 - G# 2 + note B_, 6 + octave 3 + note E_, 4 + note E_, 4 + note E_, 8 + note G#, 4 + note G#, 4 + note G#, 2 Music_SurfingPikachu_branch_82d1a:: - notetype 12, 11, 3 - octave 3 - 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 + note_type 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 octave 2 - 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 + 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 rest 3 - A_ 4 - duty 0 - notetype 12, 11, 2 - 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 + note A_, 4 + duty_cycle 0 + note_type 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 + duty_cycle 3 + sound_loop 0, Music_SurfingPikachu_branch_82d1a Music_SurfingPikachu_Ch2:: - duty 3 + duty_cycle 3 vibrato 6, 1, 5 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 4 - octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 11, 2 - octave 3 - B_ 2 - octave 4 - C# 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - F# 2 - notetype 12, 12, 4 - octave 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 12, 4 - C# 6 - notetype 12, 12, 2 - F# 2 - notetype 12, 11, 2 - C# 2 - D# 2 - E_ 2 - D# 2 - C# 2 - octave 3 - B_ 2 - A_ 2 - G# 2 - notetype 12, 12, 2 - E_ 6 - B_ 4 - B_ 4 - B_ 8 - B_ 4 - B_ 4 - B_ 2 + note_type 12, 12, 4 + octave 3 + note B_, 6 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note_type 12, 12, 4 + octave 3 + note B_, 6 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note_type 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note_type 12, 12, 4 + octave 4 + note C#, 6 + note_type 12, 12, 2 + note F#, 2 + note_type 12, 12, 4 + note C#, 6 + note_type 12, 12, 2 + note F#, 2 + note_type 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 + note_type 12, 12, 2 + note E_, 6 + note B_, 4 + note B_, 4 + note B_, 8 + note B_, 4 + note B_, 4 + note B_, 2 Music_SurfingPikachu_branch_82de0:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 6 - A_ 2 - G# 8 - F# 6 - A_ 2 + note B_, 6 + note A_, 2 + note G#, 8 + note F#, 6 + note A_, 2 octave 4 - C# 8 + note C#, 8 octave 3 - E_ 6 - G# 2 - B_ 8 + note E_, 6 + note G#, 2 + note B_, 8 octave 4 - E_ 4 + note E_, 4 octave 3 - B_ 4 - A_ 4 + note B_, 4 + note A_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - D# 2 - E_ 8 - D# 6 - C# 2 - D# 1 + note D#, 2 + note E_, 8 + note D#, 6 + note C#, 2 + note D#, 1 rest 3 - F# 4 - E_ 10 - notetype 12, 12, 6 - duty 2 - 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 + note F#, 4 + note E_, 10 + note_type 12, 12, 6 + duty_cycle 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 octave 5 - C# 4 + note C#, 4 octave 4 - B_ 8 - notetype 12, 12, 2 + note B_, 8 + note_type 12, 12, 2 octave 5 - E_ 4 - notetype 12, 12, 6 - duty 3 + note E_, 4 + note_type 12, 12, 6 + duty_cycle 3 octave 3 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 octave 4 - C# 1 - loopchannel 0, Music_SurfingPikachu_branch_82de0 + note C#, 1 + sound_loop 0, Music_SurfingPikachu_branch_82de0 Music_SurfingPikachu_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 6 + note B_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 6 + note B_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 6 + note A_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 6 + note A_, 6 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 Music_SurfingPikachu_branch_82ea0:: - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 - C_ 1 - C# 1 + note C#, 1 + note C_, 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 - D# 1 - E_ 1 + note E_, 1 + note D#, 1 + note E_, 1 rest 1 octave 4 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - B_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - loopchannel 0, Music_SurfingPikachu_branch_82ea0 + sound_loop 0, Music_SurfingPikachu_branch_82ea0 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index b28474eb..a70b2761 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -2,676 +2,676 @@ Music_TitleScreen_Ch1:: tempo 144 volume 7, 7 vibrato 9, 3, 4 - duty 3 - notetype 12, 12, 1 + duty_cycle 3 + note_type 12, 12, 1 octave 2 - E_ 1 - G_ 1 - B_ 1 + note E_, 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 + note D_, 1 octave 2 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 12, 1 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - A_ 2 - F# 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + note_type 8, 12, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 Music_TitleScreen_branch_7e4e2:: - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call Music_TitleScreen_branch_7e541 octave 3 - C_ 8 - notetype 8, 12, 6 - E_ 4 - E_ 4 - C_ 4 - notetype 12, 12, 6 + note C_, 8 + note_type 8, 12, 6 + note E_, 4 + note E_, 4 + note C_, 4 + note_type 12, 12, 6 octave 2 - B_ 8 - notetype 8, 14, 7 + note B_, 8 + note_type 8, 14, 7 octave 3 - F_ 4 - E_ 4 - C_ 4 - notetype 12, 14, 7 - D_ 10 - notetype 12, 12, 6 + note F_, 4 + note E_, 4 + note C_, 4 + note_type 12, 14, 7 + note D_, 10 + note_type 12, 12, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - C_ 2 - D_ 2 - callchannel Music_TitleScreen_branch_7e541 - callchannel Music_TitleScreen_branch_7e54a - callchannel Music_TitleScreen_branch_7e541 - C_ 6 - C_ 6 - E_ 4 - D_ 6 - F_ 2 - G_ 2 - D_ 4 - G_ 2 - G_ 6 - A_ 4 - F_ 2 - A_ 2 + note C_, 2 + note D_, 2 + sound_call Music_TitleScreen_branch_7e541 + sound_call Music_TitleScreen_branch_7e54a + sound_call 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 octave 4 - C_ 2 + note C_, 2 octave 3 - D_ 12 - E_ 4 - F_ 8 - G_ 4 - F_ 4 - E_ 12 - F_ 4 - G_ 8 - notetype 12, 11, 6 + note D_, 12 + note E_, 4 + note F_, 8 + note G_, 4 + note F_, 4 + note E_, 12 + note F_, 4 + note G_, 8 + note_type 12, 11, 6 octave 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 4 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e55c - notetype 8, 11, 2 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e55c + note_type 8, 11, 2 octave 3 - E_ 4 - E_ 4 - C# 4 - loopchannel 0, Music_TitleScreen_branch_7e4e2 + note E_, 4 + note E_, 4 + note C#, 4 + sound_loop 0, Music_TitleScreen_branch_7e4e2 Music_TitleScreen_branch_7e541:: - notetype 12, 12, 6 + note_type 12, 12, 6 octave 3 - D_ 6 + note D_, 6 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 8 - endchannel + note D_, 8 + sound_ret Music_TitleScreen_branch_7e54a:: - C_ 6 - F_ 6 - C_ 4 - D_ 8 - notetype 12, 14, 7 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 8, 12, 6 - C_ 4 + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 8 + note_type 12, 14, 7 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 8, 12, 6 + note C_, 4 octave 2 - B_ 4 + note B_, 4 octave 3 - C_ 4 - endchannel + note C_, 4 + sound_ret Music_TitleScreen_branch_7e55c:: - notetype 12, 12, 1 - D_ 1 + note_type 12, 12, 1 + note D_, 1 rest 1 octave 2 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - D_ 1 + note D_, 1 + note D_, 1 + note D_, 1 rest 1 - D_ 1 - D_ 1 - endchannel + note D_, 1 + note D_, 1 + sound_ret Music_TitleScreen_Ch2:: vibrato 16, 4, 6 - duty 1 - notetype 12, 14, 1 + duty_cycle 1 + note_type 12, 14, 1 octave 2 - G_ 1 - B_ 1 + note G_, 1 + note B_, 1 octave 3 - D_ 1 - F# 1 - G_ 4 - G_ 6 - G_ 1 - G_ 1 - G_ 4 - G_ 4 - G_ 4 - notetype 8, 14, 1 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F# 2 + 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 + note_type 8, 14, 1 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 Music_TitleScreen_branch_7e594:: vibrato 16, 4, 6 - callchannel Music_TitleScreen_branch_7e622 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 4 - F_ 4 - callchannel Music_TitleScreen_branch_7e62c + note A_, 4 + note F_, 4 + sound_call Music_TitleScreen_branch_7e62c octave 2 - A_ 8 - B_ 16 - callchannel Music_TitleScreen_branch_7e622 + note A_, 8 + note B_, 16 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 6 - F_ 2 - notetype 8, 14, 7 + note A_, 6 + note F_, 2 + note_type 8, 14, 7 octave 4 - C_ 4 + note C_, 4 octave 3 - B_ 4 + note B_, 4 octave 4 - C_ 4 - notetype 12, 14, 7 - D_ 8 - notetype 12, 9, 5 + note C_, 4 + note_type 12, 14, 7 + note D_, 8 + note_type 12, 9, 5 octave 2 - D_ 6 - D_ 1 - F# 1 - G_ 16 - callchannel Music_TitleScreen_branch_7e622 + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + sound_call Music_TitleScreen_branch_7e622 octave 2 - A_ 2 - F_ 6 - callchannel Music_TitleScreen_branch_7e62c + note A_, 2 + note F_, 6 + sound_call Music_TitleScreen_branch_7e62c octave 3 - C_ 2 + note C_, 2 octave 2 - A_ 6 - B_ 6 - G_ 2 - F_ 8 - callchannel Music_TitleScreen_branch_7e622 - notetype 8, 9, 5 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + sound_call Music_TitleScreen_branch_7e622 + note_type 8, 9, 5 octave 2 - G_ 4 - F_ 5 - A_ 3 - notetype 8, 14, 6 + note G_, 4 + note F_, 5 + note A_, 3 + note_type 8, 14, 6 octave 4 - F_ 4 - E_ 4 - F_ 4 - notetype 12, 14, 7 - G_ 6 - A# 2 - G_ 8 + note F_, 4 + note E_, 4 + note F_, 4 + note_type 12, 14, 7 + note G_, 6 + note A#, 2 + note G_, 8 vibrato 16, 2, 6 - duty 3 - notetype 12, 0, 11 - G_ 8 - notetype 12, 14, 7 - A_ 8 - duty 1 - notetype 12, 14, 7 - A# 6 - F_ 2 - F_ 8 + duty_cycle 3 + note_type 12, 0, -3 + note G_, 8 + note_type 12, 14, 7 + note A_, 8 + duty_cycle 1 + note_type 12, 14, 7 + note A#, 6 + note F_, 2 + note F_, 8 octave 3 - D_ 8 + note D_, 8 octave 4 - A# 4 - B_ 4 + note A#, 4 + note B_, 4 octave 5 - C_ 6 + note C_, 6 octave 4 - G_ 2 - G_ 8 + note G_, 2 + note G_, 8 octave 3 - E_ 8 - notetype 12, 13, 7 + note E_, 8 + note_type 12, 13, 7 octave 5 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 - notetype 8, 14, 5 + note D_, 1 + note_type 8, 14, 5 octave 5 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e636 - D_ 1 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e636 + note D_, 1 rest 2 - D_ 1 + note D_, 1 rest 3 - D_ 1 - notetype 8, 14, 3 + note D_, 1 + note_type 8, 14, 3 octave 5 - C_ 4 - C_ 4 + note C_, 4 + note C_, 4 octave 4 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e594 + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e594 Music_TitleScreen_branch_7e622:: - notetype 12, 14, 7 + note_type 12, 14, 7 octave 3 - G_ 6 - B_ 2 + note G_, 6 + note B_, 2 octave 4 - D_ 8 - notetype 12, 9, 5 - endchannel + note D_, 8 + note_type 12, 9, 5 + sound_ret Music_TitleScreen_branch_7e62c:: - notetype 12, 14, 7 + note_type 12, 14, 7 octave 4 - F_ 6 - E_ 1 - D# 1 - D_ 8 - notetype 12, 9, 5 - endchannel + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note_type 12, 9, 5 + sound_ret Music_TitleScreen_branch_7e636:: - notetype 12, 14, 1 - D_ 1 + note_type 12, 14, 1 + note D_, 1 rest 2 octave 4 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 + note D_, 1 rest 3 - D_ 1 - endchannel + note D_, 1 + sound_ret Music_TitleScreen_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 3 - G_ 1 + note G_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 5 - G_ 1 - G_ 1 - G_ 1 + note G_, 1 + note G_, 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - G_ 1 + note G_, 1 rest 3 - notetype 8, 1, 0 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - F_ 2 - A_ 2 + note_type 8, 1, 0 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note A_, 2 Music_TitleScreen_branch_7e65e:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6d0 Music_TitleScreen_branch_7e664:: - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6c9 - callchannel Music_TitleScreen_branch_7e6d0 - loopchannel 3, Music_TitleScreen_branch_7e664 - callchannel Music_TitleScreen_branch_7e6c9 - G_ 6 - D_ 3 - A_ 6 - F_ 3 - A_ 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - A# 3 - F_ 3 - callchannel Music_TitleScreen_branch_7e6d7 - B_ 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6c9 + sound_call Music_TitleScreen_branch_7e6d0 + sound_loop 3, Music_TitleScreen_branch_7e664 + sound_call Music_TitleScreen_branch_7e6c9 + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note A#, 3 + note F_, 3 + sound_call Music_TitleScreen_branch_7e6d7 + note B_, 3 + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc octave 4 - C_ 3 + note C_, 3 octave 3 - G_ 3 - callchannel Music_TitleScreen_branch_7e6dc + note G_, 3 + sound_call Music_TitleScreen_branch_7e6dc octave 4 - C# 3 + note C#, 3 octave 3 - A_ 3 - callchannel Music_TitleScreen_branch_7e6e5 + note A_, 3 + sound_call Music_TitleScreen_branch_7e6e5 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 1, 4, D_ + note D_, 4 rest 4 octave 6 - pitchbend 0, 50 - D_ 4 + pitch_slide 1, 5, D_ + note D_, 4 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 1, 4, D_ + note D_, 4 rest 2 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 - C# 4 - callchannel Music_TitleScreen_branch_7e6e5 + note C_, 4 + note C_, 4 + note C#, 4 + sound_call Music_TitleScreen_branch_7e6e5 octave 6 - pitchbend 0, 50 - D_ 4 + pitch_slide 1, 5, D_ + note D_, 4 rest 4 octave 5 - pitchbend 0, 66 - D_ 4 + pitch_slide 1, 4, D_ + note D_, 4 rest 6 - notetype 8, 1, 0 + note_type 8, 1, 0 octave 4 - C_ 4 - C_ 4 + note C_, 4 + note C_, 4 octave 3 - B_ 4 - loopchannel 0, Music_TitleScreen_branch_7e65e + note B_, 4 + sound_loop 0, Music_TitleScreen_branch_7e65e Music_TitleScreen_branch_7e6c9:: - G_ 6 - D_ 3 - G_ 6 - D_ 3 - G_ 3 - D_ 3 - endchannel + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + sound_ret Music_TitleScreen_branch_7e6d0:: - F_ 6 - C_ 3 - F_ 6 - C_ 3 - F_ 3 - C_ 3 - endchannel + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + sound_ret Music_TitleScreen_branch_7e6d7:: - A# 6 - F_ 3 - A# 6 - F_ 3 - endchannel + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + sound_ret Music_TitleScreen_branch_7e6dc:: octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 3 + note G_, 3 octave 4 - C_ 6 + note C_, 6 octave 3 - G_ 3 - endchannel + note G_, 3 + sound_ret Music_TitleScreen_branch_7e6e5:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - D_ 1 + note D_, 1 rest 5 - endchannel + sound_ret Music_TitleScreen_Ch4:: - dspeed 6 + drum_speed 6 rest 4 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - snare2 1 - rest 3 - snare2 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 2, 1 + rest 3 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare2 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - dspeed 8 - snare3 2 - snare4 2 - snare2 2 - snare3 2 - snare2 2 - snare1 2 + drum_speed 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 1, 2 Music_TitleScreen_branch_7e716:: - dspeed 12 - snare2 1 + drum_speed 12 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e834 - snare2 1 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e834 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare2 1 - snare3 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 rest 1 - snare3 1 - snare2 1 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - snare2 1 + drum_note 2, 1 rest 1 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 - rest 3 - snare2 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 + rest 3 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - snare3 1 - snare2 1 - callchannel Music_TitleScreen_branch_7e834 - callchannel Music_TitleScreen_branch_7e842 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + sound_call Music_TitleScreen_branch_7e834 + sound_call Music_TitleScreen_branch_7e842 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 1 - snare4 1 - snare3 1 - snare2 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare4 1 - snare2 1 + drum_note 2, 1 + drum_note 4, 1 + drum_note 2, 1 rest 1 - dspeed 6 - snare3 1 - snare3 1 - snare4 1 - snare4 1 - dspeed 12 - snare1 1 - rest 3 - snare2 1 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_speed 12 + drum_note 1, 1 + rest 3 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare1 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare3 1 - snare2 1 - snare3 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare4 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 4, 1 rest 1 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - snare3 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - snare5 1 + drum_note 5, 1 rest 5 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 - snare2 1 - snare1 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 1 - snare1 1 + drum_note 1, 1 rest 1 - dspeed 8 - snare2 4 - snare3 4 - snare1 4 - dspeed 12 - snare5 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 1, 4 + drum_speed 12 + drum_note 5, 1 rest 5 - snare2 1 + drum_note 2, 1 rest 3 - snare3 1 - snare2 1 - snare3 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 rest 5 - snare2 1 - snare3 1 - snare1 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 1, 1 rest 1 - snare3 1 - snare2 1 - dspeed 8 - snare2 4 - snare3 4 - snare2 4 - loopchannel 0, Music_TitleScreen_branch_7e716 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 2, 4 + drum_note 3, 4 + drum_note 2, 4 + sound_loop 0, Music_TitleScreen_branch_7e716 Music_TitleScreen_branch_7e834:: - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare2 1 - snare3 1 - snare2 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 rest 3 - endchannel + sound_ret Music_TitleScreen_branch_7e842:: - snare2 1 + drum_note 2, 1 rest 3 - snare2 1 + drum_note 2, 1 rest 5 - snare3 1 - snare2 1 - snare2 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 rest 3 - endchannel + sound_ret diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm index 395f05de..ba5d6d1b 100644 --- a/audio/music/trainerbattle.asm +++ b/audio/music/trainerbattle.asm @@ -1,1857 +1,1857 @@ Music_TrainerBattle_Ch1:: tempo 112 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 2 + toggle_perfect_pitch + note_type 12, 11, 2 rest 8 octave 3 - 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 + 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 Music_TrainerBattle_branch_22962:: - notetype 12, 11, 5 - 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 - 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 - D_ 2 - E_ 4 - C# 2 - D_ 4 - octave 2 - B_ 4 - F# 4 - octave 3 - E_ 2 - D_ 4 - C# 2 - octave 2 - B_ 2 - octave 3 - C# 2 - notetype 12, 10, 7 - D_ 8 - C# 8 - octave 2 - B_ 8 - octave 3 - C# 8 - notetype 12, 11, 5 - D_ 2 - C# 2 - octave 2 - B_ 2 - A_ 2 - G_ 2 + note_type 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 + note_type 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 + note_type 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 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note_type 12, 10, 7 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + note_type 12, 11, 5 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 2 - E_ 4 + note C#, 2 + note E_, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 4 + note C#, 4 octave 2 - G_ 1 - A_ 1 - B_ 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - C# 1 - D_ 4 + note C#, 1 + note D_, 4 octave 2 - F# 1 - G_ 1 - A_ 1 - B_ 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 3 - D_ 2 - C# 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 - A_ 2 - G_ 2 + note B_, 2 + note A_, 2 + note G_, 2 rest 2 octave 3 - 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 + 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 rest 2 - 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 + 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 octave 4 - 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 + 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 octave 4 - 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 + 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 octave 4 - 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 + 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 octave 4 - 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 + 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 octave 4 - C_ 1 - C# 1 - D_ 1 - D# 1 - E_ 1 - F_ 1 - octave 3 - A_ 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + octave 3 + note A_, 4 octave 4 - D_ 4 - octave 3 - A_ 2 - D_ 1 - E_ 1 - F# 1 - G_ 1 - G# 1 - A# 1 - B_ 2 + 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 octave 4 - C_ 2 + note C_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - C_ 2 + note C_, 2 octave 3 - G_ 2 - B_ 2 - F_ 2 - G_ 2 - A_ 2 + note G_, 2 + note B_, 2 + note F_, 2 + note G_, 2 + note A_, 2 octave 4 - C_ 2 - D_ 2 + note C_, 2 + note D_, 2 rest 2 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 - D_ 2 + note C_, 4 + note D_, 2 octave 3 - F_ 1 - G_ 1 - A_ 1 - B_ 1 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 octave 4 - 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 + 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 octave 3 - B_ 2 - C_ 2 + note B_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - C_ 2 + note D_, 2 + note F_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - C_ 2 + note E_, 2 + note C_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - C_ 2 - E_ 2 - D_ 2 + note C_, 2 + note E_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 - D_ 2 + note F_, 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - D_ 2 - F_ 2 - D_ 16 - C_ 16 + note D_, 2 + note F_, 2 + note D_, 16 + note C_, 16 octave 2 - A# 16 - G_ 12 + note A#, 16 + note G_, 12 octave 3 - D_ 1 - E_ 1 - G_ 1 + note D_, 1 + note E_, 1 + note G_, 1 octave 4 - C_ 1 - D_ 8 - F_ 8 + note C_, 1 + note D_, 8 + note F_, 8 octave 3 - A# 8 + note A#, 8 octave 4 - C_ 8 - D_ 8 - E_ 8 - F_ 8 - G_ 8 - E_ 2 + note C_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note G_, 8 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 4 - E_ 2 + note E_, 2 rest 2 octave 3 - C_ 2 - D_ 4 + note C_, 2 + note D_, 4 octave 2 - B_ 2 + note B_, 2 octave 3 - C# 4 + note C#, 4 rest 2 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 1 octave 2 - B_ 1 + note B_, 1 rest 1 octave 3 - C# 1 + note C#, 1 rest 9 - D_ 1 - D# 1 - E_ 1 - F_ 1 - F_ 1 - E_ 1 - D# 1 - D_ 1 - C# 1 + 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 rest 5 - C# 1 - D_ 1 - E_ 1 + note C#, 1 + note D_, 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - D_ 1 + note D_, 1 rest 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 + 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 rest 9 - F# 2 - E_ 4 - D# 2 - E_ 2 - F# 2 - G# 2 - E_ 8 - F# 8 - G_ 8 + 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 octave 4 - C_ 4 + note C_, 4 octave 3 - G_ 1 - G# 1 - A_ 1 - A# 1 - loopchannel 0, Music_TrainerBattle_branch_22962 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + sound_loop 0, Music_TrainerBattle_branch_22962 Music_TrainerBattle_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 4 - 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 + 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 octave 4 - C_ 1 + note C_, 1 octave 3 - B_ 1 - notetype 12, 14, 1 + note B_, 1 + note_type 12, 14, 1 octave 4 - B_ 16 + note B_, 16 rest 16 - notetype 12, 13, 1 - B_ 16 + note_type 12, 13, 1 + note B_, 16 rest 12 - A_ 4 - notetype 12, 12, 2 + note A_, 4 + note_type 12, 12, 2 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 6 - D_ 4 + note C#, 6 + note D_, 4 octave 3 - B_ 2 + note B_, 2 octave 4 - C# 4 - D_ 6 - A_ 2 - A# 2 - B_ 6 + note C#, 4 + note D_, 6 + note A_, 2 + note A#, 2 + note B_, 6 octave 5 - C# 6 - D_ 4 + note C#, 6 + note D_, 4 octave 4 - B_ 2 + note B_, 2 octave 5 - C# 4 - D_ 6 + note C#, 4 + note D_, 6 octave 4 - A_ 4 + note A_, 4 Music_TrainerBattle_branch_22bfc:: - notetype 12, 12, 7 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 5, 0 + note_type 12, 12, 7 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 5, 0 octave 4 - C_ 8 - notetype 12, 3, 0 - C_ 8 - notetype 12, 4, 14 - C_ 8 - notetype 12, 12, 7 - C_ 8 - octave 3 - B_ 6 - F# 14 - B_ 4 - F# 4 - B_ 4 - notetype 12, 9, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 3, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 + note C_, 8 + note_type 12, 3, 0 + note C_, 8 + note_type 12, 4, -6 + note C_, 8 + note_type 12, 12, 7 + note C_, 8 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + note_type 12, 9, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 3, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 octave 4 - D_ 8 - octave 3 - G_ 8 - notetype 12, 8, 0 - A_ 8 - notetype 12, 5, 0 - A_ 8 - notetype 12, 4, 0 - A_ 8 - notetype 12, 6, 0 - A_ 8 - notetype 12, 12, 7 - G_ 16 + note D_, 8 + octave 3 + note G_, 8 + note_type 12, 8, 0 + note A_, 8 + note_type 12, 5, 0 + note A_, 8 + note_type 12, 4, 0 + note A_, 8 + note_type 12, 6, 0 + note A_, 8 + note_type 12, 12, 7 + note G_, 16 octave 4 - E_ 8 - F# 8 - E_ 16 - notetype 12, 12, 5 - G_ 4 - A_ 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 - E_ 2 - notetype 12, 11, 7 - F# 8 - notetype 12, 5, 0 - F# 8 - notetype 12, 6, 0 - F# 8 - notetype 12, 7, 0 - F# 8 - notetype 12, 10, 0 - G_ 8 - notetype 12, 10, 7 - G_ 8 - notetype 12, 11, 7 - G_ 4 - notetype 12, 12, 5 - A_ 2 - G_ 2 - G_ 2 - F# 2 - E_ 2 - F# 2 - notetype 12, 10, 0 - G# 8 - notetype 12, 7, 0 - G# 8 - notetype 12, 8, 0 - G# 8 - notetype 12, 6, 0 - G# 8 - notetype 12, 10, 0 - A_ 16 - notetype 12, 11, 0 + note E_, 8 + note F#, 8 + note E_, 16 + note_type 12, 12, 5 + note G_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note_type 12, 11, 7 + note F#, 8 + note_type 12, 5, 0 + note F#, 8 + note_type 12, 6, 0 + note F#, 8 + note_type 12, 7, 0 + note F#, 8 + note_type 12, 10, 0 + note G_, 8 + note_type 12, 10, 7 + note G_, 8 + note_type 12, 11, 7 + note G_, 4 + note_type 12, 12, 5 + note A_, 2 + note G_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note_type 12, 10, 0 + note G#, 8 + note_type 12, 7, 0 + note G#, 8 + note_type 12, 8, 0 + note G#, 8 + note_type 12, 6, 0 + note G#, 8 + note_type 12, 10, 0 + note A_, 16 + note_type 12, 11, 0 octave 5 - C# 8 - E_ 8 - notetype 12, 12, 0 - D_ 4 + note C#, 8 + note E_, 8 + note_type 12, 12, 0 + note D_, 4 octave 4 - A_ 4 + note A_, 4 octave 5 - C_ 2 - notetype 12, 12, 7 + note C_, 2 + note_type 12, 12, 7 octave 4 - B_ 8 - notetype 12, 6, 0 - B_ 8 - notetype 12, 6, 9 - B_ 6 - notetype 12, 9, 6 - B_ 6 + note B_, 8 + note_type 12, 6, 0 + note B_, 8 + note_type 12, 6, -1 + note B_, 6 + note_type 12, 9, 6 + note B_, 6 rest 2 - notetype 12, 12, 0 + note_type 12, 12, 0 octave 5 - D_ 4 + note D_, 4 octave 4 - A_ 4 - A# 2 - notetype 12, 11, 0 + note A_, 4 + note A#, 2 + note_type 12, 11, 0 octave 5 - F_ 14 - notetype 12, 6, 0 - G_ 16 - notetype 12, 5, 0 - E_ 16 - notetype 12, 4, 0 - E_ 16 - notetype 12, 12, 7 + note F_, 14 + note_type 12, 6, 0 + note G_, 16 + note_type 12, 5, 0 + note E_, 16 + note_type 12, 4, 0 + note E_, 16 + note_type 12, 12, 7 octave 4 - C_ 6 + note C_, 6 octave 3 - A_ 14 + note A_, 14 octave 4 - C_ 4 + note C_, 4 octave 3 - A_ 4 + note A_, 4 octave 4 - C_ 4 + note C_, 4 octave 3 - A# 6 + note A#, 6 octave 4 - F_ 14 + note F_, 14 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 4 - D_ 4 - C_ 6 + note F_, 4 + note D_, 4 + note C_, 6 octave 3 - A_ 14 + note A_, 14 octave 4 - C_ 4 - E_ 2 - D_ 2 - C_ 2 - E_ 2 - D_ 2 - octave 3 - A# 4 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A#, 4 octave 4 - F_ 10 - G_ 6 - F_ 6 - D_ 4 - notetype 12, 11, 0 - F_ 16 - E_ 16 - D_ 16 - E_ 16 - notetype 12, 10, 0 + note F_, 10 + note G_, 6 + note F_, 6 + note D_, 4 + note_type 12, 11, 0 + note F_, 16 + note E_, 16 + note D_, 16 + note E_, 16 + note_type 12, 10, 0 octave 5 - F_ 16 - E_ 16 - G_ 16 - F_ 16 - notetype 12, 13, 1 - octave 3 - A# 6 - A# 6 - A# 4 - A_ 6 - A_ 6 - A_ 4 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + note_type 12, 13, 1 + octave 3 + note A#, 6 + note A#, 6 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 4 octave 4 - C_ 6 - C_ 6 - C_ 4 - octave 3 - A# 6 - A# 6 - A_ 4 - notetype 12, 12, 7 - A_ 4 - B_ 4 - G_ 2 - A_ 10 - B_ 2 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + note A#, 6 + note A#, 6 + note A_, 4 + note_type 12, 12, 7 + note A_, 4 + note B_, 4 + note G_, 2 + note A_, 10 + note B_, 2 octave 4 - C# 2 - E_ 2 - D_ 2 - C# 2 + note C#, 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A# 16 + note B_, 2 + note A#, 16 rest 2 - A# 2 + note A#, 2 octave 4 - C_ 2 - F_ 2 - E_ 2 - D_ 2 - C_ 2 - octave 3 - A# 2 - B_ 16 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note B_, 16 rest 2 - B_ 2 + note B_, 2 octave 4 - C# 2 - G_ 2 - F# 2 - E_ 2 - D_ 2 + note C#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 octave 3 - B_ 2 + note B_, 2 octave 4 - C_ 16 - E_ 8 - G_ 8 - loopchannel 0, Music_TrainerBattle_branch_22bfc + note C_, 16 + note E_, 8 + note G_, 8 + sound_loop 0, Music_TrainerBattle_branch_22bfc Music_TrainerBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 4 + note_type 12, 1, 4 octave 3 - 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 + 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 octave 2 - B_ 1 - A# 1 - B_ 1 - A# 1 - A_ 1 - G# 1 - A_ 2 - A# 2 - B_ 2 - B_ 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 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 - E_ 2 - D_ 2 + note F_, 2 + note E_, 2 + note D_, 2 octave 2 - B_ 2 - B_ 2 + note B_, 2 + note B_, 2 octave 3 - D_ 2 - E_ 2 + note D_, 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - C_ 2 + note C_, 2 Music_TrainerBattle_branch_22d9c:: octave 2 - A# 1 - B_ 1 + note A#, 1 + note B_, 1 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 2 - A_ 2 - G# 2 - G_ 2 + note A_, 2 + note G#, 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 + note G_, 2 octave 3 - D_ 2 + note D_, 2 octave 2 - G_ 2 - G# 2 - A_ 2 + note G_, 2 + note G#, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - D_ 2 - C# 2 + note E_, 2 + note D_, 2 + note C#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 octave 2 - A_ 4 + note A_, 4 octave 3 - C_ 2 - G_ 2 + note C_, 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 + note G_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - G_ 2 - D_ 4 + note G_, 2 + note D_, 4 octave 2 - A_ 4 - A# 2 + note A_, 4 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - F_ 4 + note F_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - D_ 4 + note D_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A# 4 + note A#, 4 octave 3 - E_ 4 + note E_, 4 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 - E_ 2 + note E_, 2 + note E_, 2 octave 2 - B_ 2 - A_ 2 + note B_, 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A_ 2 + note A_, 2 octave 3 - E_ 2 + note E_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - A# 2 + note A#, 2 octave 3 - F_ 2 + note F_, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - F# 2 + note F#, 2 octave 2 - B_ 2 + note B_, 2 octave 3 - 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 + 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 + sound_loop 0, Music_TrainerBattle_branch_22d9c diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm index 10ca4beb..a2291a2a 100644 --- a/audio/music/unusedsong.asm +++ b/audio/music/unusedsong.asm @@ -4,335 +4,335 @@ Music_UnusedSong_Ch1:: vibrato 5, 1, 6 Music_UnusedSong_branch_a91b:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - D# 4 - C# 4 - D# 1 - E_ 1 + note D#, 4 + note C#, 4 + note D#, 1 + note E_, 1 rest 1 - F# 1 + note F#, 1 rest 1 octave 5 - B_ 2 + note B_, 2 rest 1 octave 6 - E_ 1 + note E_, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - E_ 1 + note E_, 1 rest 8 - D# 1 + note D#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 rest 1 octave 6 - C# 1 + note C#, 1 rest 1 octave 5 - B_ 1 + note B_, 1 octave 6 - D# 1 + note D#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - C# 1 + note C#, 1 octave 5 - B_ 1 + note B_, 1 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 3 octave 5 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - E_ 2 - F# 8 + note E_, 2 + note F#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 rest 2 octave 5 - G# 2 + note G#, 2 rest 2 - A_ 2 + note A_, 2 rest 2 - B_ 2 + note B_, 2 rest 2 octave 6 - D# 2 - E_ 8 + note D#, 2 + note E_, 8 rest 2 - D# 2 - C# 2 - D# 2 + note D#, 2 + note C#, 2 + note D#, 2 octave 5 - A_ 2 - G# 2 - A_ 2 - A# 1 - B_ 1 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 1 + note B_, 1 rest 4 - F# 2 + note F#, 2 rest 2 - B_ 2 - A# 2 - B_ 2 + note B_, 2 + note A#, 2 + note B_, 2 octave 6 - C_ 1 - C# 1 + note C_, 1 + note C#, 1 rest 8 octave 5 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 octave 6 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 6 - B_ 2 + note B_, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a91b - endchannel + sound_loop 0, Music_UnusedSong_branch_a91b + sound_ret Music_UnusedSong_Ch2:: tempo 144 volume 7, 7 - toggleperfectpitch + toggle_perfect_pitch vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 6 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 8 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 4 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - D# 2 + note D#, 2 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 - G# 1 + note A_, 1 + note G#, 1 rest 4 - E_ 2 + note E_, 2 rest 2 - D# 1 + note D#, 1 rest 1 - F# 1 + note F#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 - F# 1 + note G#, 1 + note F#, 1 rest 8 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 - F# 1 + note E_, 1 + note F#, 1 rest 2 - F# 4 - E_ 4 - F# 1 - G# 1 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 2 + note F#, 2 rest 1 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - E_ 2 + note E_, 2 rest 2 - G# 2 + note G#, 2 rest 2 - D# 8 + note D#, 8 rest 2 - E_ 2 - D# 2 - C# 2 + note E_, 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 + note B_, 2 rest 2 octave 6 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 + note F#, 2 rest 2 - C# 8 + note C#, 8 rest 2 - D# 2 - C# 2 + note D#, 2 + note C#, 2 octave 5 - B_ 2 - A_ 2 - G# 2 - A_ 2 - G# 1 - F# 1 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 rest 8 - B_ 2 - A# 2 - B_ 2 - A_ 1 - G# 1 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 rest 4 - G# 2 - rest 2 - F# 2 - F_ 2 - F# 2 - G# 2 - A_ 2 - E_ 2 - C# 2 - E_ 2 - F# 2 + 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 rest 6 - D# 2 + note D#, 2 rest 6 - loopchannel 0, Music_UnusedSong_branch_a9d8 - endchannel + sound_loop 0, Music_UnusedSong_branch_a9d8 + sound_ret diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm index 94f87b25..2788cde9 100644 --- a/audio/music/vermilion.asm +++ b/audio/music/vermilion.asm @@ -1,323 +1,323 @@ Music_Vermilion_Ch1:: tempo 156 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 12, 3, 4 - toggleperfectpitch + toggle_perfect_pitch Music_Vermilion_branch_b9f6:: - notetype 12, 11, 5 + note_type 12, 11, 5 octave 3 - 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 + 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 octave 4 - C# 2 - D_ 2 - C# 2 + note C#, 2 + note D_, 2 + note C#, 2 octave 3 - B_ 2 - A_ 2 - G# 1 - A_ 1 - B_ 2 + note B_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 2 octave 4 - C# 2 - E_ 2 + note C#, 2 + note E_, 2 octave 3 - A_ 2 + note A_, 2 octave 4 - D_ 2 + note D_, 2 octave 3 - G# 2 + note G#, 2 octave 4 - C# 2 + note C#, 2 octave 3 - 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 + 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 + sound_loop 0, Music_Vermilion_branch_b9f6 Music_Vermilion_Ch2:: - duty 3 + duty_cycle 3 vibrato 10, 2, 3 Music_Vermilion_branch_ba66:: - notetype 12, 12, 7 + note_type 12, 12, 7 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 - A_ 1 - B_ 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C# 8 + note C#, 8 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 1 + note C#, 1 octave 3 - B_ 1 - A_ 8 - A_ 8 + note B_, 1 + note A_, 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 - A_ 1 - B_ 1 + note B_, 6 + note A_, 1 + note B_, 1 octave 4 - C# 8 + note C#, 8 octave 3 - A_ 8 + note A_, 8 octave 4 - D_ 4 - C# 4 + note D_, 4 + note C#, 4 octave 3 - B_ 6 + note B_, 6 octave 4 - C# 1 + note C#, 1 octave 3 - B_ 1 - A_ 8 - B_ 4 + note B_, 1 + note A_, 8 + note B_, 4 octave 4 - 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 + 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 + sound_loop 0, Music_Vermilion_branch_ba66 Music_Vermilion_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 Music_Vermilion_branch_baa8:: octave 4 - 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 + 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 + sound_loop 0, Music_Vermilion_branch_baa8 Music_Vermilion_Ch4:: - dspeed 12 + drum_speed 12 Music_Vermilion_branch_bb0e:: - callchannel Music_Vermilion_branch_bb3f - 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 - callchannel Music_Vermilion_branch_bb3f - callchannel Music_Vermilion_branch_bb3f - loopchannel 0, Music_Vermilion_branch_bb0e + sound_call Music_Vermilion_branch_bb3f + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 1 + sound_loop 4, Music_Vermilion_branch_bb0e + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_call Music_Vermilion_branch_bb3f + sound_loop 0, Music_Vermilion_branch_bb0e Music_Vermilion_branch_bb3f:: - 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 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + drum_note 6, 2 + drum_note 6, 1 + drum_note 6, 1 + sound_ret diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm index 3a88678f..f7cfab14 100644 --- a/audio/music/wildbattle.asm +++ b/audio/music/wildbattle.asm @@ -1,738 +1,738 @@ Music_WildBattle_Ch1:: tempo 104 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 6, 3, 4 - toggleperfectpitch - notetype 12, 11, 3 + toggle_perfect_pitch + note_type 12, 11, 3 octave 4 - C_ 1 + note C_, 1 octave 3 - 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 + 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 octave 2 - B_ 1 + note B_, 1 octave 3 - C_ 1 + note C_, 1 octave 2 - B_ 1 - A# 1 - A_ 1 - A# 1 - B_ 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 octave 3 - C_ 1 - C# 1 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - notetype 12, 4, 15 - C# 10 - notetype 12, 11, 1 - G_ 6 - E_ 6 - D# 12 - C# 14 - E_ 6 - D# 10 - C# 10 + note C_, 1 + note C#, 1 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note_type 12, 4, -7 + note C#, 10 + note_type 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note C#, 10 Music_WildBattle_branch_230e0:: - notetype 12, 11, 3 - 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 + note_type 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 octave 2 - B_ 1 + note B_, 1 octave 3 - 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 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - E_ 6 - D_ 6 - F_ 4 - notetype 12, 11, 7 - A_ 16 - G_ 16 - notetype 12, 11, 5 - D_ 4 - C_ 4 - D_ 4 - F_ 4 - G_ 6 - A_ 6 - B_ 4 - notetype 12, 11, 7 + 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 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note E_, 6 + note D_, 6 + note F_, 4 + note_type 12, 11, 7 + note A_, 16 + note G_, 16 + note_type 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note B_, 4 + note_type 12, 11, 7 octave 4 - C_ 16 - notetype 12, 3, 15 - G_ 16 - notetype 12, 11, 5 + note C_, 16 + note_type 12, 3, -7 + note G_, 16 + note_type 12, 11, 5 octave 3 - C_ 12 - C_ 2 + note C_, 12 + note C_, 2 rest 2 - D_ 2 - C_ 2 + note D_, 2 + note C_, 2 rest 12 - C# 12 - C# 2 + note C#, 12 + note C#, 2 rest 2 - F_ 2 - notetype 12, 10, 3 - D# 6 - notetype 12, 10, 7 - C# 8 - loopchannel 0, Music_WildBattle_branch_230e0 + note F_, 2 + note_type 12, 10, 3 + note D#, 6 + note_type 12, 10, 7 + note C#, 8 + sound_loop 0, Music_WildBattle_branch_230e0 Music_WildBattle_Ch2:: - duty 3 + duty_cycle 3 vibrato 8, 2, 5 - notetype 12, 12, 3 + note_type 12, 12, 3 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 + note G_, 1 octave 4 - G_ 1 - F# 1 - F_ 1 + note G_, 1 + note F#, 1 + note F_, 1 octave 5 - G_ 1 - notetype 12, 12, 2 + note G_, 1 + note_type 12, 12, 2 octave 4 - G_ 6 + note G_, 6 octave 3 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - notetype 12, 9, 0 - F# 10 - notetype 12, 12, 2 - G_ 6 - G_ 6 - G_ 12 - G_ 14 - G_ 6 - G_ 10 - G_ 10 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note_type 12, 9, 0 + note F#, 10 + note_type 12, 12, 2 + note G_, 6 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note G_, 10 Music_WildBattle_branch_23225:: - notetype 12, 12, 5 - G_ 6 - F# 6 - E_ 4 - G_ 6 - A_ 6 - G_ 4 + note_type 12, 12, 5 + note G_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note A_, 6 + note G_, 4 octave 4 - G# 12 - G_ 2 + note G#, 12 + note G_, 2 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - notetype 12, 11, 7 + note_type 12, 11, 7 octave 5 - C# 8 - notetype 12, 12, 5 + note C#, 8 + note_type 12, 12, 5 octave 4 - C_ 6 + note C_, 6 octave 3 - A# 6 - G# 4 + note A#, 6 + note G#, 4 octave 4 - C# 6 - C_ 6 + note C#, 6 + note C_, 6 octave 3 - A# 4 + note A#, 4 octave 4 - F_ 6 - E_ 6 - D_ 4 - notetype 12, 12, 7 + note F_, 6 + note E_, 6 + note D_, 4 + note_type 12, 12, 7 octave 3 - A# 4 + note A#, 4 octave 4 - C_ 4 - D_ 4 - F_ 4 - notetype 12, 12, 0 - G# 16 - notetype 12, 11, 0 - G# 16 - notetype 12, 4, 14 - G_ 16 - notetype 12, 12, 7 - G_ 16 + note C_, 4 + note D_, 4 + note F_, 4 + note_type 12, 12, 0 + note G#, 16 + note_type 12, 11, 0 + note G#, 16 + note_type 12, 4, -6 + note G_, 16 + note_type 12, 12, 7 + note G_, 16 octave 3 - F_ 8 - A# 8 + note F_, 8 + note A#, 8 octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - E_ 16 - notetype 12, 12, 7 - E_ 16 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note E_, 16 + note_type 12, 12, 7 + note E_, 16 octave 3 - F_ 8 - A# 8 + note F_, 8 + note A#, 8 octave 4 - D_ 8 - F_ 8 - notetype 12, 12, 0 - G_ 16 - notetype 12, 3, 15 + note D_, 8 + note F_, 8 + note_type 12, 12, 0 + note G_, 16 + note_type 12, 3, -7 octave 5 - C_ 16 - notetype 12, 12, 5 + note C_, 16 + note_type 12, 12, 5 octave 4 - E_ 12 - E_ 2 + note E_, 12 + note E_, 2 rest 2 - F_ 2 - notetype 12, 12, 1 - E_ 4 - notetype 12, 12, 5 + note F_, 2 + note_type 12, 12, 1 + note E_, 4 + note_type 12, 12, 5 rest 10 - F_ 12 - F_ 2 + note F_, 12 + note F_, 2 rest 2 - G# 2 - notetype 12, 10, 3 - G_ 6 - notetype 12, 12, 7 - F_ 8 - loopchannel 0, Music_WildBattle_branch_23225 + note G#, 2 + note_type 12, 10, 3 + note G_, 6 + note_type 12, 12, 7 + note F_, 8 + sound_loop 0, Music_WildBattle_branch_23225 Music_WildBattle_Ch3:: vibrato 0, 2, 0 - notetype 12, 1, 1 + note_type 12, 1, 1 octave 4 - C# 1 + note C#, 1 rest 1 - C# 1 - C_ 1 - D_ 1 + note C#, 1 + note C_, 1 + note D_, 1 rest 1 - D_ 1 - C_ 1 - D# 1 + note D_, 1 + note C_, 1 + note D#, 1 rest 1 - D# 1 - C_ 1 - E_ 1 + note D#, 1 + note C_, 1 + note E_, 1 rest 1 - E_ 1 - C_ 1 - F_ 1 + note E_, 1 + note C_, 1 + note F_, 1 rest 1 - F_ 1 - C_ 1 - F# 1 + note F_, 1 + note C_, 1 + note F#, 1 rest 1 - F# 1 - C_ 1 - G_ 1 + note F#, 1 + note C_, 1 + note G_, 1 rest 1 - G_ 1 - C_ 1 + note G_, 1 + note C_, 1 octave 3 - A# 2 - B_ 2 + note A#, 2 + note B_, 2 Music_WildBattle_branch_232b5:: octave 4 - 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 + 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 + sound_loop 2, Music_WildBattle_branch_232b5 Music_WildBattle_branch_232d8:: - 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 + 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 rest 2 - G# 2 - G_ 2 + note G#, 2 + note G_, 2 rest 4 - 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 + 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 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - F_ 2 + note F_, 2 octave 3 - A# 2 + note A#, 2 octave 4 - 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 + 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 + sound_loop 0, Music_WildBattle_branch_232d8 diff --git a/audio/music/yellowintro.asm b/audio/music/yellowintro.asm index c809d10f..bb741a22 100644 --- a/audio/music/yellowintro.asm +++ b/audio/music/yellowintro.asm @@ -1,484 +1,484 @@ Music_YellowIntro_Ch1:: tempo 116 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 12, 11, 2 + note_type 12, 11, 2 octave 3 - 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 - C# 1 - C_ 1 - C# 10 + 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 + note_type 12, 11, 6 + octave 4 + note C#, 1 + note C_, 1 + note C#, 10 octave 3 - G# 1 - G_ 1 - G# 4 - B_ 4 - octave 4 - E_ 4 - F# 8 - E_ 8 + note G#, 1 + note G_, 1 + note G#, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 8 + note E_, 8 octave 3 - A_ 4 - B_ 4 + note A_, 4 + note B_, 4 octave 4 - C# 4 + note C#, 4 octave 3 - B_ 4 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - G# 6 - notetype 12, 11, 2 - B_ 2 - notetype 12, 11, 6 - octave 4 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 - E_ 6 - notetype 12, 11, 2 - G# 2 - notetype 12, 11, 6 + note B_, 4 + note G#, 6 + note_type 12, 11, 2 + note B_, 2 + note_type 12, 11, 6 + note G#, 6 + note_type 12, 11, 2 + note B_, 2 + note_type 12, 11, 6 + octave 4 + note E_, 6 + note_type 12, 11, 2 + note G#, 2 + note_type 12, 11, 6 + note E_, 6 + note_type 12, 11, 2 + note G#, 2 + note_type 12, 11, 6 octave 3 - A_ 4 - F# 4 - A_ 4 - B_ 4 - F# 4 - G# 4 - A_ 2 - G# 2 - F# 2 - D# 2 - notetype 12, 11, 3 - 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 - F# 1 - F_ 1 - F# 8 + 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 + note_type 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 + note_type 12, 11, 6 + note F#, 1 + note F_, 1 + note F#, 8 octave 3 - B_ 1 - A# 1 - B_ 8 - octave 4 - F# 1 - F_ 1 - F# 2 - notetype 12, 11, 3 - F# 1 - E_ 1 - D# 1 - C# 1 - notetype 12, 11, 2 + note B_, 1 + note A#, 1 + note B_, 8 + octave 4 + note F#, 1 + note F_, 1 + note F#, 2 + note_type 12, 11, 3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + note_type 12, 11, 2 octave 3 - B_ 16 - endchannel + note B_, 16 + sound_ret Music_YellowIntro_Ch2:: - duty 2 + duty_cycle 2 vibrato 6, 1, 5 - notetype 12, 12, 2 + note_type 12, 12, 2 octave 3 - 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 - G# 1 - G_ 1 - G# 10 + 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 + note_type 12, 12, 5 + note G#, 1 + note G_, 1 + note G#, 10 octave 3 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 7 - octave 4 - E_ 4 - G# 4 - B_ 4 + note B_, 1 + note A#, 1 + note B_, 6 + note_type 12, 12, 7 + octave 4 + note E_, 4 + note G#, 4 + note B_, 4 octave 5 - C# 16 + note C#, 16 octave 4 - A_ 4 - G# 4 - F# 4 - E_ 4 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 octave 3 - B_ 6 - notetype 12, 12, 2 + note B_, 6 + note_type 12, 12, 2 octave 4 - E_ 2 - notetype 12, 12, 7 + note E_, 2 + note_type 12, 12, 7 octave 3 - B_ 6 - notetype 12, 12, 2 - octave 4 - E_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - G# 6 - notetype 12, 12, 2 - B_ 2 - notetype 12, 12, 7 - C# 4 + note B_, 6 + note_type 12, 12, 2 + octave 4 + note E_, 2 + note_type 12, 12, 7 + note G#, 6 + note_type 12, 12, 2 + note B_, 2 + note_type 12, 12, 7 + note G#, 6 + note_type 12, 12, 2 + note B_, 2 + note_type 12, 12, 7 + note C#, 4 octave 3 - A_ 4 - octave 4 - C# 4 - D# 4 - E_ 2 - D# 2 - C# 2 - D# 4 - D# 2 - C# 2 + 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 octave 3 - B_ 2 - notetype 12, 12, 3 - octave 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 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 8 - B_ 1 - A# 1 - B_ 6 - notetype 12, 12, 3 - B_ 1 - A_ 1 - G# 1 - F# 1 - notetype 12, 12, 2 - E_ 16 - endchannel + note B_, 2 + note_type 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 + note_type 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 + note_type 12, 12, 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note_type 12, 12, 2 + note E_, 16 + sound_ret Music_YellowIntro_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 3 - B_ 1 + note B_, 1 rest 1 octave 4 - C# 1 + note C#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - F# 1 + note F#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - C# 1 + note C#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 1 octave 4 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - G# 1 + note G#, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - A_ 1 + note A_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - E_ 1 + note E_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - A_ 1 + note A_, 1 rest 1 octave 5 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 + note F#, 1 rest 1 octave 5 - C# 1 + note C#, 1 rest 3 - F# 1 + note F#, 1 rest 1 octave 4 - F# 1 - G# 1 - A_ 1 + note F#, 1 + note G#, 1 + note A_, 1 octave 5 - C# 1 - E_ 1 + note C#, 1 + note E_, 1 rest 15 - endchannel + sound_ret diff --git a/audio/music/yellowunusedsong.asm b/audio/music/yellowunusedsong.asm index f65ca164..f1e4d18f 100644 --- a/audio/music/yellowunusedsong.asm +++ b/audio/music/yellowunusedsong.asm @@ -1,51 +1,51 @@ Music_YellowUnusedSong_Ch1:: tempo 140 volume 7, 7 - duty 3 + duty_cycle 3 vibrato 8, 1, 4 - notetype 8, 11, 2 + note_type 8, 11, 2 octave 3 - 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 + 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 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 + 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 octave 4 - D# 6 - D_ 12 + note D#, 6 + note D_, 12 rest 16 rest 16 rest 16 @@ -53,274 +53,274 @@ Music_YellowUnusedSong_branch_82fde:: rest 16 rest 16 octave 3 - 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 + 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 + sound_loop 0, Music_YellowUnusedSong_branch_82fde Music_YellowUnusedSong_Ch2:: - duty 2 - notetype 8, 12, 2 + duty_cycle 2 + note_type 8, 12, 2 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 + 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 octave 3 - A_ 6 + note A_, 6 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 + 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 Music_YellowUnusedSong_branch_8302a:: - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 + 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 octave 3 - A_ 6 + note A_, 6 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - G# 6 - G_ 12 - notetype 8, 9, 0 + 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 + note_type 8, 9, 0 octave 3 - D# 16 - D# 8 - D# 16 - D# 8 + note D#, 16 + note D#, 8 + note D#, 16 + note D#, 8 octave 2 - A# 16 - A# 8 + note A#, 16 + note A#, 8 octave 3 - D# 12 - F_ 12 - notetype 8, 12, 2 + note D#, 12 + note F_, 12 + note_type 8, 12, 2 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - C_ 6 - C_ 6 - D_ 6 + 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 octave 3 - A_ 6 + note A_, 6 octave 4 - D_ 6 - D_ 2 - D_ 2 - D_ 2 - D# 6 - D# 6 - D_ 6 - A# 6 - A_ 12 - loopchannel 0, Music_YellowUnusedSong_branch_8302a + 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 + sound_loop 0, Music_YellowUnusedSong_branch_8302a Music_YellowUnusedSong_Ch3:: - notetype 12, 1, 0 + note_type 12, 1, 0 vibrato 2, 1, 5 rest 16 rest 12 octave 4 - C_ 4 - D_ 8 - D# 8 - G_ 8 - A# 8 + note C_, 4 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 Music_YellowUnusedSong_branch_83075:: - A_ 8 - A# 8 - G_ 8 - A_ 4 - D_ 4 - A_ 8 - A# 8 + note A_, 8 + note A#, 8 + note G_, 8 + note A_, 4 + note D_, 4 + note A_, 8 + note A#, 8 octave 5 - C# 8 - D_ 8 - D# 16 - D# 16 + note C#, 8 + note D_, 8 + note D#, 16 + note D#, 16 octave 4 - A# 16 + note A#, 16 octave 5 - D# 8 - F_ 8 + note D#, 8 + note F_, 8 octave 4 - D_ 16 - D_ 16 + note D_, 16 + note D_, 16 octave 4 - D_ 8 - D# 8 - G_ 8 - A# 8 - loopchannel 0, Music_YellowUnusedSong_branch_83075 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 + sound_loop 0, Music_YellowUnusedSong_branch_83075 Music_YellowUnusedSong_Ch4:: - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 Music_YellowUnusedSong_branch_830c3:: - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 2 - snare3 2 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - snare3 4 - dspeed 8 - snare3 2 - snare3 2 - snare3 2 - dspeed 12 - snare3 4 - snare3 4 - snare3 2 - snare3 2 - snare3 2 - snare3 2 - snare3 4 - snare3 4 - loopchannel 0, Music_YellowUnusedSong_branch_830c3 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 4 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + sound_loop 0, Music_YellowUnusedSong_branch_830c3 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index c14be83e..ef909832 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ -SFX_59_1_Ch1: - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel +SFX_59_1_Ch5: + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret -SFX_59_1_Ch2: - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel +SFX_59_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 3b817f2f..7510842f 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,11 +1,11 @@ -SFX_59_3_Ch1: - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel +SFX_59_3_Ch5: + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret -SFX_59_3_Ch2: - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel +SFX_59_3_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 6c3959c9..30d12c8b 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_1_Ch1: - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Arrow_Tiles_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 8ff79858..81c1774a 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_3_Ch1: - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Arrow_Tiles_3_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 6cd9701b..396adf44 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ -SFX_Ball_Poof_Ch1: - duty 2 - unknownsfx0x10 22 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel +SFX_Ball_Poof_Ch5: + duty_cycle 2 + pitch_sweep 1, 6 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret -SFX_Ball_Poof_Ch2: - unknownnoise0x20 15, 162, 34 - endchannel +SFX_Ball_Poof_Ch8: + noise_note 15, 10, 2, 34 + sound_ret diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 49176db3..207bf720 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: - duty 2 - unknownsfx0x10 47 - unknownsfx0x20 15, 242, 128, 7 - endchannel +SFX_Ball_Toss_Ch5: + duty_cycle 2 + pitch_sweep 2, -7 + square_note 15, 15, 2, 1920 + sound_ret -SFX_Ball_Toss_Ch2: - duty 2 - unknownsfx0x20 15, 194, 130, 7 - endchannel +SFX_Ball_Toss_Ch6: + duty_cycle 2 + square_note 15, 12, 2, 1922 + sound_ret diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 8b92fc50..7a61373b 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ -SFX_Battle_09_Ch1: - duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 5 - unknownsfx0x10 8 - endchannel +SFX_Battle_09_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 27909666..e60fe9c7 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: - unknownnoise0x20 8, 241, 84 - endchannel +SFX_Battle_0B_Ch8: + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 7aa009ba..285e0d52 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ -SFX_Battle_0C_Ch1: - unknownnoise0x20 15, 143, 17 - unknownnoise0x20 4, 255, 18 - unknownnoise0x20 10, 241, 85 - endchannel +SFX_Battle_0C_Ch8: + noise_note 15, 8, -7, 17 + noise_note 4, 15, -7, 18 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 1b69e13f..293d9743 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ -SFX_Battle_0D_Ch1: - unknownnoise0x20 15, 143, 52 - unknownnoise0x20 8, 242, 53 - unknownnoise0x20 10, 241, 85 - endchannel +SFX_Battle_0D_Ch8: + noise_note 15, 8, -7, 52 + noise_note 8, 15, 2, 53 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index ff60cb9e..39d971c9 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: - unknownnoise0x20 15, 159, 35 - unknownnoise0x20 8, 241, 33 - endchannel +SFX_Battle_0E_Ch8: + noise_note 15, 9, -7, 35 + noise_note 8, 15, 1, 33 + sound_ret diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 3827a5a6..ae81e747 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ -SFX_Battle_0F_Ch1: - unknownnoise0x20 2, 225, 75 - unknownnoise0x20 10, 241, 68 - unknownnoise0x20 2, 225, 58 - unknownnoise0x20 6, 241, 52 - endchannel +SFX_Battle_0F_Ch8: + noise_note 2, 14, 1, 75 + noise_note 10, 15, 1, 68 + noise_note 2, 14, 1, 58 + noise_note 6, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 7d301053..7a092bd3 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch1: - unknownnoise0x20 8, 79, 35 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_Battle_12_Ch1 - endchannel +SFX_Battle_12_Ch8: + noise_note 8, 4, -7, 35 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + sound_loop 4, SFX_Battle_12_Ch8 + sound_ret diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 89b8c555..0f910cec 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ -SFX_Battle_13_Ch1: - unknownnoise0x20 8, 79, 51 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - unknownnoise0x20 15, 242, 34 - endchannel +SFX_Battle_13_Ch8: + noise_note 8, 4, -7, 51 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + noise_note 15, 15, 2, 34 + sound_ret diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index acc064f7..7c3a7c68 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ -SFX_Battle_14_Ch1: - unknownnoise0x20 8, 255, 50 - unknownnoise0x20 8, 244, 67 - unknownnoise0x20 8, 242, 84 - unknownnoise0x20 8, 241, 101 - endchannel +SFX_Battle_14_Ch8: + noise_note 8, 15, -7, 50 + noise_note 8, 15, 4, 67 + noise_note 8, 15, 2, 84 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index 3aa31247..6e162cce 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ -SFX_Battle_16_Ch1: - unknownnoise0x20 1, 148, 35 - unknownnoise0x20 1, 180, 34 - unknownnoise0x20 8, 241, 68 - endchannel +SFX_Battle_16_Ch8: + noise_note 1, 9, 4, 35 + noise_note 1, 11, 4, 34 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 2ff4bd6d..f863f8ee 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ -SFX_Battle_17_Ch1: - unknownnoise0x20 2, 148, 51 - unknownnoise0x20 4, 180, 34 - unknownnoise0x20 4, 241, 68 - unknownnoise0x20 8, 241, 85 - endchannel +SFX_Battle_17_Ch8: + noise_note 2, 9, 4, 51 + noise_note 4, 11, 4, 34 + noise_note 4, 15, 1, 68 + noise_note 8, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 81fa2178..f8ece58e 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: - unknownnoise0x20 4, 255, 85 - unknownnoise0x20 8, 241, 101 - endchannel +SFX_Battle_18_Ch8: + noise_note 4, 15, -7, 85 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 9981f5e4..a7cf5292 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ -SFX_Battle_19_Ch1: - unknownnoise0x20 2, 132, 67 - unknownnoise0x20 2, 196, 34 - unknownnoise0x20 8, 242, 52 - endchannel +SFX_Battle_19_Ch8: + noise_note 2, 8, 4, 67 + noise_note 2, 12, 4, 34 + noise_note 8, 15, 2, 52 + sound_ret diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 9f89e449..16ea584d 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 15, 242, 18 - endchannel +SFX_Battle_1B_Ch8: + noise_note 2, 15, 1, 34 + noise_note 15, 15, 2, 18 + sound_ret diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 3827b34c..3045576b 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ -SFX_Battle_1C_Ch1: - unknownnoise0x20 2, 194, 1 - unknownnoise0x20 15, 244, 1 - unknownnoise0x20 15, 242, 1 - endchannel +SFX_Battle_1C_Ch8: + noise_note 2, 12, 2, 1 + noise_note 15, 15, 4, 1 + noise_note 15, 15, 2, 1 + sound_ret diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index f4e9bdc8..26820e8d 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ -SFX_Battle_1E_Ch1: - duty 0 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel +SFX_Battle_1E_Ch5: + duty_cycle 0 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret -SFX_Battle_1E_Ch2: - unknownnoise0x20 0, 209, 66 - unknownnoise0x20 4, 161, 50 - unknownnoise0x20 0, 209, 34 - unknownnoise0x20 6, 161, 50 - endchannel +SFX_Battle_1E_Ch8: + noise_note 0, 13, 1, 66 + noise_note 4, 10, 1, 50 + noise_note 0, 13, 1, 34 + noise_note 6, 10, 1, 50 + sound_ret diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index e8a4d9f3..b73b0a8f 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: - unknownnoise0x20 12, 241, 84 - unknownnoise0x20 8, 241, 100 - endchannel +SFX_Battle_20_Ch8: + noise_note 12, 15, 1, 84 + noise_note 8, 15, 1, 100 + sound_ret diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index b59f5833..fc1b1186 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ -SFX_Battle_21_Ch1: - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 193, 50 - unknownnoise0x20 2, 161, 49 - unknownnoise0x20 15, 130, 50 - unknownnoise0x20 8, 241, 52 - endchannel +SFX_Battle_21_Ch8: + noise_note 2, 15, 1, 51 + noise_note 2, 12, 1, 50 + noise_note 2, 10, 1, 49 + noise_note 15, 8, 2, 50 + noise_note 8, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 66cd218d..3c42996e 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 - endchannel +SFX_Battle_22_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 7203dcf2..bf546248 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ -SFX_Battle_23_Ch1: - unknownnoise0x20 2, 242, 67 - unknownnoise0x20 4, 181, 50 - unknownnoise0x20 9, 134, 49 - unknownnoise0x20 7, 100, 0 - unknownnoise0x20 15, 242, 85 - endchannel +SFX_Battle_23_Ch8: + noise_note 2, 15, 2, 67 + noise_note 4, 11, 5, 50 + noise_note 9, 8, 6, 49 + noise_note 7, 6, 4, 0 + noise_note 15, 15, 2, 85 + sound_ret diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 7c81b40b..f99cf59a 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ -SFX_Battle_24_Ch1: - duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Battle_24_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1792 + pitch_sweep 0, 8 + sound_ret -SFX_Battle_24_Ch2: - unknownnoise0x20 15, 63, 34 - unknownnoise0x20 15, 242, 33 - endchannel +SFX_Battle_24_Ch8: + noise_note 15, 3, -7, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index b1f4fc54..54623b5f 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ -SFX_Battle_25_Ch1: - unknownnoise0x20 15, 79, 65 - unknownnoise0x20 8, 143, 65 - unknownnoise0x20 8, 207, 65 - unknownnoise0x20 8, 242, 66 - unknownnoise0x20 15, 242, 65 - endchannel +SFX_Battle_25_Ch8: + noise_note 15, 4, -7, 65 + noise_note 8, 8, -7, 65 + noise_note 8, 12, -7, 65 + noise_note 8, 15, 2, 66 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index c656264b..f3baea99 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ -SFX_Battle_26_Ch1: - unknownnoise0x20 10, 255, 80 - unknownnoise0x20 15, 255, 81 - unknownnoise0x20 8, 242, 81 - unknownnoise0x20 6, 255, 82 - unknownnoise0x20 6, 255, 83 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 242, 84 - endchannel +SFX_Battle_26_Ch8: + noise_note 10, 15, -7, 80 + noise_note 15, 15, -7, 81 + noise_note 8, 15, 2, 81 + noise_note 6, 15, -7, 82 + noise_note 6, 15, -7, 83 + noise_note 8, 15, -7, 84 + noise_note 15, 15, 2, 84 + sound_ret diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index af86c33f..1b505811 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ -SFX_Battle_27_Ch1: - duty 2 - unknownsfx0x20 15, 63, 192, 7 +SFX_Battle_27_Ch5: + duty_cycle 2 + square_note 15, 3, -7, 1984 SFX_Battle_27_branch_2062a: - unknownsfx0x20 15, 223, 192, 7 - loopchannel 4, SFX_Battle_27_branch_2062a - unknownsfx0x20 15, 209, 192, 7 - endchannel + square_note 15, 13, -7, 1984 + sound_loop 4, SFX_Battle_27_branch_2062a + square_note 15, 13, 1, 1984 + sound_ret -SFX_Battle_27_Ch2: - dutycycle 179 - unknownsfx0x20 15, 47, 200, 7 +SFX_Battle_27_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: - unknownsfx0x20 15, 207, 199, 7 - loopchannel 4, SFX_Battle_27_branch_2063d - unknownsfx0x20 15, 193, 200, 7 - endchannel + square_note 15, 12, -7, 1991 + sound_loop 4, SFX_Battle_27_branch_2063d + square_note 15, 12, 1, 1992 + sound_ret -SFX_Battle_27_Ch3: - unknownnoise0x20 3, 151, 18 - unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_Battle_27_Ch3 - endchannel +SFX_Battle_27_Ch8: + noise_note 3, 9, 7, 18 + noise_note 3, 10, 1, 17 + sound_loop 10, SFX_Battle_27_Ch8 + sound_ret diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 1c974e85..467e411d 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch1: - duty 0 - unknownsfx0x20 0, 241, 192, 7 - unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_Battle_28_Ch1 - endchannel +SFX_Battle_28_Ch5: + duty_cycle 0 + square_note 0, 15, 1, 1984 + square_note 0, 15, 1, 1792 + sound_loop 12, SFX_Battle_28_Ch5 + sound_ret -SFX_Battle_28_Ch2: - dutycycle 179 - unknownsfx0x20 0, 225, 193, 7 - unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_Battle_28_Ch2 - endchannel +SFX_Battle_28_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 0, 14, 1, 1985 + square_note 0, 14, 1, 1793 + sound_loop 12, SFX_Battle_28_Ch6 + sound_ret -SFX_Battle_28_Ch3: - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_Battle_28_Ch3 - endchannel +SFX_Battle_28_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 6, SFX_Battle_28_Ch8 + sound_ret diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index 0db98b36..c3999ec8 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ -SFX_Earthquake_Ch1: - dutycycle 201 - unknownsfx0x20 11, 243, 32, 1 - unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_Earthquake_Ch1 - unknownsfx0x20 8, 227, 48, 1 - unknownsfx0x20 15, 194, 16, 1 - endchannel +SFX_Battle_29_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 11, 15, 3, 288 + square_note 9, 13, 3, 336 + sound_loop 5, SFX_Battle_29_Ch5 + square_note 8, 14, 3, 304 + square_note 15, 12, 2, 272 + sound_ret -SFX_Earthquake_Ch2: - unknownnoise0x20 10, 243, 53 - unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_Earthquake_Ch2 - unknownnoise0x20 12, 244, 188 - unknownnoise0x20 12, 245, 156 - unknownnoise0x20 15, 244, 172 - endchannel +SFX_Battle_29_Ch8: + noise_note 10, 15, 3, 53 + noise_note 14, 15, 6, 69 + sound_loop 4, SFX_Battle_29_Ch8 + noise_note 12, 15, 4, 188 + noise_note 12, 15, 5, 156 + noise_note 15, 15, 4, 172 + sound_ret diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index ab01bf85..1faf2dda 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch1: - dutycycle 57 - unknownsfx0x20 4, 244, 0, 6 - unknownsfx0x20 3, 196, 0, 5 - unknownsfx0x20 5, 181, 0, 6 - unknownsfx0x20 13, 226, 192, 6 - loopchannel 3, SFX_Battle_2A_Ch1 - unknownsfx0x20 8, 209, 0, 6 - endchannel +SFX_Battle_2A_Ch5: + duty_cycle_pattern 0, 3, 2, 1 + square_note 4, 15, 4, 1536 + square_note 3, 12, 4, 1280 + square_note 5, 11, 5, 1536 + square_note 13, 14, 2, 1728 + sound_loop 3, SFX_Battle_2A_Ch5 + square_note 8, 13, 1, 1536 + sound_ret -SFX_Battle_2A_Ch2: - dutycycle 141 - unknownsfx0x20 5, 228, 224, 5 - unknownsfx0x20 4, 180, 224, 4 - unknownsfx0x20 6, 165, 232, 5 - unknownsfx0x20 14, 209, 160, 6 - loopchannel 3, SFX_Battle_2A_Ch2 - endchannel +SFX_Battle_2A_Ch6: + duty_cycle_pattern 2, 0, 3, 1 + square_note 5, 14, 4, 1504 + square_note 4, 11, 4, 1248 + square_note 6, 10, 5, 1512 + square_note 14, 13, 1, 1696 + sound_loop 3, SFX_Battle_2A_Ch6 + sound_ret -SFX_Battle_2A_Ch3: - unknownnoise0x20 5, 195, 51 - unknownnoise0x20 3, 146, 67 - unknownnoise0x20 10, 181, 51 - unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_Battle_2A_Ch3 - endchannel +SFX_Battle_2A_Ch8: + noise_note 5, 12, 3, 51 + noise_note 3, 9, 2, 67 + noise_note 10, 11, 5, 51 + noise_note 15, 12, 3, 50 + sound_loop 2, SFX_Battle_2A_Ch8 + sound_ret diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 6eddfa76..d60a96f6 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch1: - dutycycle 210 - unknownsfx0x20 3, 129, 0, 3 - unknownsfx0x20 3, 193, 0, 4 - unknownsfx0x20 3, 241, 0, 5 - unknownsfx0x20 3, 177, 0, 4 - unknownsfx0x20 3, 113, 0, 3 - loopchannel 5, SFX_Battle_2B_Ch1 - unknownsfx0x20 8, 129, 0, 4 - endchannel +SFX_Battle_2B_Ch5: + duty_cycle_pattern 3, 1, 0, 2 + square_note 3, 8, 1, 768 + square_note 3, 12, 1, 1024 + square_note 3, 15, 1, 1280 + square_note 3, 11, 1, 1024 + square_note 3, 7, 1, 768 + sound_loop 5, SFX_Battle_2B_Ch5 + square_note 8, 8, 1, 1024 + sound_ret -SFX_Battle_2B_Ch2: - unknownnoise0x20 3, 98, 34 - unknownnoise0x20 3, 162, 50 - unknownnoise0x20 3, 210, 51 - unknownnoise0x20 3, 146, 35 - unknownnoise0x20 3, 82, 18 - loopchannel 5, SFX_Battle_2B_Ch2 - unknownnoise0x20 8, 129, 18 - endchannel +SFX_Battle_2B_Ch8: + noise_note 3, 6, 2, 34 + noise_note 3, 10, 2, 50 + noise_note 3, 13, 2, 51 + noise_note 3, 9, 2, 35 + noise_note 3, 5, 2, 18 + sound_loop 5, SFX_Battle_2B_Ch8 + noise_note 8, 8, 1, 18 + sound_ret diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 9cd9bd16..7530210f 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch1: - dutycycle 57 - unknownsfx0x20 15, 244, 0, 5 - unknownsfx0x20 15, 196, 0, 4 - unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_Battle_2C_Ch1 - endchannel +SFX_Battle_2C_Ch5: + duty_cycle_pattern 0, 3, 2, 1 + square_note 15, 15, 4, 1280 + square_note 15, 12, 4, 1024 + square_note 15, 14, 2, 1472 + sound_loop 3, SFX_Battle_2C_Ch5 + sound_ret -SFX_Battle_2C_Ch2: - dutycycle 141 - unknownsfx0x20 7, 228, 48, 4 - unknownsfx0x20 15, 180, 48, 3 - unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_Battle_2C_Ch2 - endchannel +SFX_Battle_2C_Ch6: + duty_cycle_pattern 2, 0, 3, 1 + square_note 7, 14, 4, 1072 + square_note 15, 11, 4, 816 + square_note 15, 10, 2, 1080 + sound_loop 4, SFX_Battle_2C_Ch6 + sound_ret -SFX_Battle_2C_Ch3: - unknownnoise0x20 9, 244, 68 - unknownnoise0x20 9, 242, 67 - unknownnoise0x20 15, 244, 66 - unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_Battle_2C_Ch3 - endchannel +SFX_Battle_2C_Ch8: + noise_note 9, 15, 4, 68 + noise_note 9, 15, 2, 67 + noise_note 15, 15, 4, 66 + noise_note 15, 15, 4, 65 + sound_loop 3, SFX_Battle_2C_Ch8 + sound_ret diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index a0841ccf..ab5665fa 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch1: - duty 0 - unknownsfx0x20 2, 241, 0, 2 - unknownsfx0x20 3, 241, 0, 7 - unknownsfx0x20 4, 241, 0, 5 - unknownsfx0x20 5, 241, 240, 7 - loopchannel 8, SFX_Battle_2E_Ch1 - endchannel +SFX_Battle_2E_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 512 + square_note 3, 15, 1, 1792 + square_note 4, 15, 1, 1280 + square_note 5, 15, 1, 2032 + sound_loop 8, SFX_Battle_2E_Ch5 + sound_ret -SFX_Battle_2E_Ch2: - dutycycle 179 - unknownsfx0x20 2, 225, 2, 3 - unknownsfx0x20 3, 225, 242, 7 - unknownsfx0x20 4, 225, 2, 6 - unknownsfx0x20 5, 225, 2, 7 - loopchannel 8, SFX_Battle_2E_Ch2 - endchannel +SFX_Battle_2E_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 14, 1, 770 + square_note 3, 14, 1, 2034 + square_note 4, 14, 1, 1538 + square_note 5, 14, 1, 1794 + sound_loop 8, SFX_Battle_2E_Ch6 + sound_ret -SFX_Battle_2E_Ch3: - unknownnoise0x20 2, 211, 16 - unknownnoise0x20 3, 211, 17 - unknownnoise0x20 2, 210, 16 - unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_Battle_2E_Ch3 - endchannel +SFX_Battle_2E_Ch8: + noise_note 2, 13, 3, 16 + noise_note 3, 13, 3, 17 + noise_note 2, 13, 2, 16 + noise_note 5, 13, 2, 18 + sound_loop 9, SFX_Battle_2E_Ch8 + sound_ret diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index f511c832..dd80e599 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Thunderbolt_Ch1: - dutycycle 43 - unknownsfx0x20 3, 241, 240, 7 - unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_Thunderbolt_Ch1 - endchannel +SFX_Battle_2F_Ch5: + duty_cycle_pattern 0, 2, 2, 3 + square_note 3, 15, 1, 2032 + square_note 4, 15, 2, 512 + sound_loop 8, SFX_Battle_2F_Ch5 + sound_ret -SFX_Thunderbolt_Ch2: - dutycycle 179 - unknownsfx0x20 4, 226, 2, 2 - unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_Thunderbolt_Ch2 - endchannel +SFX_Battle_2F_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 4, 14, 2, 514 + square_note 4, 14, 1, 2018 + sound_loop 9, SFX_Battle_2F_Ch6 + sound_ret -SFX_Thunderbolt_Ch3: - unknownnoise0x20 4, 255, 67 - unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_Thunderbolt_Ch3 - endchannel +SFX_Battle_2F_Ch8: + noise_note 4, 15, -7, 67 + noise_note 4, 15, 2, 68 + sound_loop 9, SFX_Battle_2F_Ch8 + sound_ret diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index c88cc476..83dc96f4 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ -SFX_Battle_31_Ch1: - duty 2 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel +SFX_Battle_31_Ch5: + duty_cycle 2 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Battle_31_Ch2: - duty 3 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 242, 226, 7 - endchannel +SFX_Battle_31_Ch6: + duty_cycle 3 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, 2, 2018 + sound_ret diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index a85d4334..c906dcac 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ -SFX_Battle_32_Ch1: - duty 2 - unknownsfx0x10 175 - unknownsfx0x20 8, 241, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Battle_32_Ch5: + duty_cycle 2 + pitch_sweep 10, -7 + square_note 8, 15, 1, 1792 + pitch_sweep 0, 8 + sound_ret -SFX_Battle_32_Ch2: - duty 3 - unknownsfx0x20 8, 241, 1, 7 - endchannel +SFX_Battle_32_Ch6: + duty_cycle 3 + square_note 8, 15, 1, 1793 + sound_ret diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 25b1ee42..95afe045 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ -SFX_Battle_33_Ch1: - duty 2 - unknownsfx0x20 6, 241, 0, 5 - unknownsfx0x20 6, 241, 128, 5 - unknownsfx0x20 6, 241, 0, 6 - unknownsfx0x20 6, 241, 128, 6 - unknownsfx0x20 8, 241, 0, 7 - endchannel +SFX_Battle_33_Ch5: + duty_cycle 2 + square_note 6, 15, 1, 1280 + square_note 6, 15, 1, 1408 + square_note 6, 15, 1, 1536 + square_note 6, 15, 1, 1664 + square_note 8, 15, 1, 1792 + sound_ret -SFX_Battle_33_Ch2: - duty 3 - unknownsfx0x20 6, 225, 16, 5 - unknownsfx0x20 6, 225, 144, 5 - unknownsfx0x20 6, 225, 16, 6 - unknownsfx0x20 6, 225, 144, 6 - unknownsfx0x20 8, 225, 16, 7 - endchannel +SFX_Battle_33_Ch6: + duty_cycle 3 + square_note 6, 14, 1, 1296 + square_note 6, 14, 1, 1424 + square_note 6, 14, 1, 1552 + square_note 6, 14, 1, 1680 + square_note 8, 14, 1, 1808 + sound_ret diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 14718916..654049e4 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ -SFX_Battle_34_Ch1: - dutycycle 237 - unknownsfx0x20 8, 255, 248, 3 - unknownsfx0x20 15, 255, 0, 4 - unknownsfx0x20 15, 243, 0, 4 - endchannel +SFX_Battle_34_Ch5: + duty_cycle_pattern 3, 2, 3, 1 + square_note 8, 15, -7, 1016 + square_note 15, 15, -7, 1024 + square_note 15, 15, 3, 1024 + sound_ret -SFX_Battle_34_Ch2: - dutycycle 180 - unknownsfx0x20 8, 239, 192, 3 - unknownsfx0x20 15, 239, 192, 3 - unknownsfx0x20 15, 227, 192, 3 - endchannel +SFX_Battle_34_Ch6: + duty_cycle_pattern 2, 3, 1, 0 + square_note 8, 14, -7, 960 + square_note 15, 14, -7, 960 + square_note 15, 14, 3, 960 + sound_ret -SFX_Battle_34_Ch3: - unknownnoise0x20 4, 255, 81 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 255, 85 - unknownnoise0x20 15, 243, 86 - endchannel +SFX_Battle_34_Ch8: + noise_note 4, 15, -7, 81 + noise_note 8, 15, -7, 84 + noise_note 15, 15, -7, 85 + noise_note 15, 15, 3, 86 + sound_ret diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 2fe57bc4..e9f78657 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,29 +1,29 @@ -SFX_Battle_35_Ch1: - executemusic +SFX_Battle_35_Ch5: + execute_music vibrato 10, 2, 4 - duty 2 - notetype 10, 8, 7 + duty_cycle 2 + note_type 10, 8, 7 octave 5 - G# 8 + note G#, 8 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 - endchannel + note G#, 8 + sound_ret -SFX_Battle_35_Ch2: - executemusic +SFX_Battle_35_Ch6: + execute_music vibrato 10, 2, 3 - duty 2 - notetype 11, 6, 7 + duty_cycle 2 + note_type 11, 6, 7 octave 5 - G# 8 - notetype 10, 6, 7 + note G#, 8 + note_type 10, 6, 7 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 - endchannel + note G#, 8 + sound_ret diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index dcf9c56e..773bf753 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ -SFX_Battle_36_Ch1: - duty 0 - unknownsfx0x20 2, 241, 128, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 144, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 160, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 176, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 192, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 208, 7 +SFX_Battle_36_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 SFX_Battle_36_branch_20930: - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 224, 7 - loopchannel 12, SFX_Battle_36_branch_20930 - unknownsfx0x20 15, 241, 0, 7 - endchannel + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1792 + sound_ret -SFX_Battle_36_Ch2: - dutycycle 179 - unknownsfx0x20 2, 241, 129, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 145, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 161, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 177, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 193, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 209, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 225, 7 - loopchannel 12, SFX_Battle_36_branch_20930 - unknownsfx0x20 15, 241, 1, 7 - endchannel +SFX_Battle_36_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2001 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2017 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1793 + sound_ret -SFX_Battle_36_Ch3: - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_Battle_36_Ch3 - endchannel +SFX_Battle_36_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, SFX_Battle_36_Ch8 + sound_ret diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d4f3e858..3fe278f3 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,61 +1,61 @@ -SFX_Caught_Mon_Ch1: - executemusic +SFX_Caught_Mon_Ch5: + execute_music tempo 256 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 6, 11, 2 + duty_cycle 3 + toggle_perfect_pitch + note_type 6, 11, 2 octave 3 - E_ 2 - F# 2 - G# 2 - G# 1 - G# 1 - B_ 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 1 + note G#, 1 + note B_, 2 octave 4 - C# 2 - D# 2 - D# 1 - D# 1 - notetype 6, 11, 5 - E_ 8 - endchannel + note C#, 2 + note D#, 2 + note D#, 1 + note D#, 1 + note_type 6, 11, 5 + note E_, 8 + sound_ret -SFX_Caught_Mon_Ch2: - executemusic - duty 2 - notetype 6, 12, 2 +SFX_Caught_Mon_Ch6: + execute_music + duty_cycle 2 + note_type 6, 12, 2 octave 4 - 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 - G# 8 - endchannel + 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 + note_type 6, 12, 5 + note G#, 8 + sound_ret -SFX_Caught_Mon_Ch3: - executemusic - notetype 6, 1, 0 +SFX_Caught_Mon_Ch7: + execute_music + note_type 6, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 octave 5 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 - G_ 2 - G# 4 - endchannel + note F#, 2 + note G_, 2 + note G#, 4 + sound_ret diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 7a45bdf4..70eb33ae 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ -SFX_Collision_1_Ch1: - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel +SFX_Collision_1_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 601670d5..8b557bcc 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ -SFX_Collision_3_Ch1: - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel +SFX_Collision_3_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 4fc82294..22a41634 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,21 +1,21 @@ -SFX_Cry00_1_Ch1: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel +SFX_Cry00_1_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_1_Ch2: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel +SFX_Cry00_1_Ch6: + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_1_Ch3: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel +SFX_Cry00_1_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index ccce6943..97d17e8f 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,21 +1,21 @@ -SFX_Cry00_2_Ch1: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel +SFX_Cry00_2_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_2_Ch2: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel +SFX_Cry00_2_Ch6: + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_2_Ch3: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel +SFX_Cry00_2_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 9b8b6fda..e332c35e 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,21 +1,21 @@ -SFX_Cry00_3_Ch1: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel +SFX_Cry00_3_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_3_Ch2: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel +SFX_Cry00_3_Ch6: + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_3_Ch3: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel +SFX_Cry00_3_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index d684af6f..cb35392b 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,24 +1,24 @@ -SFX_Cry01_1_Ch1: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel +SFX_Cry01_1_Ch5: + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_1_Ch2: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel +SFX_Cry01_1_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_1_Ch3: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel +SFX_Cry01_1_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 0e1030e1..449adac7 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,24 +1,24 @@ -SFX_Cry01_2_Ch1: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel +SFX_Cry01_2_Ch5: + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_2_Ch2: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel +SFX_Cry01_2_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_2_Ch3: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel +SFX_Cry01_2_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index be084d7e..ef8e5e8c 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,24 +1,24 @@ -SFX_Cry01_3_Ch1: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel +SFX_Cry01_3_Ch5: + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_3_Ch2: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel +SFX_Cry01_3_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_3_Ch3: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel +SFX_Cry01_3_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index d4b520c9..3db37e97 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,17 +1,17 @@ -SFX_Cry02_1_Ch1: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel +SFX_Cry02_1_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_1_Ch2: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 +SFX_Cry02_1_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_1_Ch3: - endchannel +SFX_Cry02_1_Ch8: + sound_ret diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 526e8c48..a623e071 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,17 +1,17 @@ -SFX_Cry02_2_Ch1: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel +SFX_Cry02_2_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_2_Ch2: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 +SFX_Cry02_2_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_2_Ch3: - endchannel +SFX_Cry02_2_Ch8: + sound_ret diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 2366ff97..4e0861d1 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,17 +1,17 @@ -SFX_Cry02_3_Ch1: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel +SFX_Cry02_3_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_3_Ch2: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 +SFX_Cry02_3_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_3_Ch3: - endchannel +SFX_Cry02_3_Ch8: + sound_ret diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 72ea5d38..cb58c394 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,30 +1,30 @@ -SFX_Cry03_1_Ch1: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel +SFX_Cry03_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_1_Ch2: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel +SFX_Cry03_1_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_1_Ch3: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Cry03_1_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index de043909..2813ce1a 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,30 +1,30 @@ -SFX_Cry03_2_Ch1: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel +SFX_Cry03_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_2_Ch2: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel +SFX_Cry03_2_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_2_Ch3: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Cry03_2_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 467745f9..ae561a7a 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,30 +1,30 @@ -SFX_Cry03_3_Ch1: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel +SFX_Cry03_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_3_Ch2: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel +SFX_Cry03_3_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_3_Ch3: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Cry03_3_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 2c34f1c6..24662192 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,32 +1,32 @@ -SFX_Cry04_1_Ch1: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel +SFX_Cry04_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_1_Ch2: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel +SFX_Cry04_1_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_1_Ch3: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Cry04_1_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index 38bfbf63..f18fd9cd 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,32 +1,32 @@ -SFX_Cry04_2_Ch1: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel +SFX_Cry04_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_2_Ch2: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel +SFX_Cry04_2_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_2_Ch3: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Cry04_2_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index bd73c271..718af40f 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,32 +1,32 @@ -SFX_Cry04_3_Ch1: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel +SFX_Cry04_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_3_Ch2: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel +SFX_Cry04_3_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_3_Ch3: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Cry04_3_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 8de5bf02..1c3fce20 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,19 +1,19 @@ -SFX_Cry05_1_Ch1: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel +SFX_Cry05_1_Ch5: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_1_Ch2: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 +SFX_Cry05_1_Ch6: + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_1_Ch3: - endchannel +SFX_Cry05_1_Ch8: + sound_ret diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 28879677..53f076f2 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,19 +1,19 @@ -SFX_Cry05_2_Ch1: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel +SFX_Cry05_2_Ch5: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_2_Ch2: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 +SFX_Cry05_2_Ch6: + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_2_Ch3: - endchannel +SFX_Cry05_2_Ch8: + sound_ret diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 261492af..2d5b02b8 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,19 +1,19 @@ -SFX_Cry05_3_Ch1: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel +SFX_Cry05_3_Ch5: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_3_Ch2: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 +SFX_Cry05_3_Ch6: + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_3_Ch3: - endchannel +SFX_Cry05_3_Ch8: + sound_ret diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index e171b025..03b75b0a 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,22 +1,22 @@ -SFX_Cry06_1_Ch1: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 +SFX_Cry06_1_Ch5: + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_1_Ch2: - endchannel +SFX_Cry06_1_Ch6: + sound_ret -SFX_Cry06_1_Ch3: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel +SFX_Cry06_1_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 5e6e9e6a..6ddbfeb0 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,22 +1,22 @@ -SFX_Cry06_2_Ch1: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 +SFX_Cry06_2_Ch5: + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_2_Ch2: - endchannel +SFX_Cry06_2_Ch6: + sound_ret -SFX_Cry06_2_Ch3: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel +SFX_Cry06_2_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 5d2994f1..d509053b 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,22 +1,22 @@ -SFX_Cry06_3_Ch1: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 +SFX_Cry06_3_Ch5: + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_3_Ch2: - endchannel +SFX_Cry06_3_Ch6: + sound_ret -SFX_Cry06_3_Ch3: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel +SFX_Cry06_3_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index e48a50a2..3733e746 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,21 +1,21 @@ -SFX_Cry07_1_Ch1: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Cry07_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_1_Ch2: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel +SFX_Cry07_1_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_1_Ch3: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel +SFX_Cry07_1_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index ab902a30..6a134397 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,21 +1,21 @@ -SFX_Cry07_2_Ch1: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Cry07_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_2_Ch2: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel +SFX_Cry07_2_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_2_Ch3: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel +SFX_Cry07_2_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 40fad544..a8b60f38 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,21 +1,21 @@ -SFX_Cry07_3_Ch1: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Cry07_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_3_Ch2: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel +SFX_Cry07_3_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_3_Ch3: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel +SFX_Cry07_3_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 6ec5ca3c..92f17fa8 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,23 +1,23 @@ -SFX_Cry08_1_Ch1: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel +SFX_Cry08_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_1_Ch2: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel +SFX_Cry08_1_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_1_Ch3: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Cry08_1_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 9c154b1c..53ac2891 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,23 +1,23 @@ -SFX_Cry08_2_Ch1: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel +SFX_Cry08_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_2_Ch2: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel +SFX_Cry08_2_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_2_Ch3: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Cry08_2_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 95fea40e..81bcf360 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,23 +1,23 @@ -SFX_Cry08_3_Ch1: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel +SFX_Cry08_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_3_Ch2: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel +SFX_Cry08_3_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_3_Ch3: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Cry08_3_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 46aae33c..f8c600bd 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,35 +1,35 @@ -SFX_Cry09_1_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel +SFX_Cry09_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_1_Ch2: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel +SFX_Cry09_1_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_1_Ch3: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel +SFX_Cry09_1_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 8ce97609..12965e07 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,35 +1,35 @@ -SFX_Cry09_2_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel +SFX_Cry09_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_2_Ch2: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel +SFX_Cry09_2_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_2_Ch3: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel +SFX_Cry09_2_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index a6b40dde..2c85d750 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,35 +1,35 @@ -SFX_Cry09_3_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel +SFX_Cry09_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_3_Ch2: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel +SFX_Cry09_3_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_3_Ch3: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel +SFX_Cry09_3_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 4264e858..bcb71844 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_1_Ch1: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel +SFX_Cry0A_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_1_Ch2: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel +SFX_Cry0A_1_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_1_Ch3: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel +SFX_Cry0A_1_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 42a8e603..fb365e91 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_2_Ch1: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel +SFX_Cry0A_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_2_Ch2: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel +SFX_Cry0A_2_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_2_Ch3: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel +SFX_Cry0A_2_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index f8576fa1..bf6dfcf1 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_3_Ch1: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel +SFX_Cry0A_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_3_Ch2: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel +SFX_Cry0A_3_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_3_Ch3: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel +SFX_Cry0A_3_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index d0da6c2e..51e445ab 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_1_Ch1: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Cry0B_1_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_1_Ch2: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel +SFX_Cry0B_1_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_1_Ch3: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel +SFX_Cry0B_1_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 0fe7840a..68cb0ba6 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_2_Ch1: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Cry0B_2_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_2_Ch2: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel +SFX_Cry0B_2_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_2_Ch3: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel +SFX_Cry0B_2_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index ff761b85..3328a8b6 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_3_Ch1: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Cry0B_3_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_3_Ch2: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel +SFX_Cry0B_3_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_3_Ch3: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel +SFX_Cry0B_3_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 4ff72662..a59f9e8d 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_1_Ch1: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Cry0C_1_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_1_Ch2: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 +SFX_Cry0C_1_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_1_Ch3: - endchannel +SFX_Cry0C_1_Ch8: + sound_ret diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 8fb925da..5be195a9 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_2_Ch1: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Cry0C_2_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_2_Ch2: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 +SFX_Cry0C_2_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_2_Ch3: - endchannel +SFX_Cry0C_2_Ch8: + sound_ret diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 149b585d..f75f7a64 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_3_Ch1: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Cry0C_3_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_3_Ch2: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 +SFX_Cry0C_3_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_3_Ch3: - endchannel +SFX_Cry0C_3_Ch8: + sound_ret diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index dccccb4e..3bd1c4e5 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_1_Ch1: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_1_Ch1 - endchannel +SFX_Cry0D_1_Ch5: + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_1_Ch5 + sound_ret -SFX_Cry0D_1_Ch2: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel +SFX_Cry0D_1_Ch6: + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_1_Ch3: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel +SFX_Cry0D_1_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 718364dd..1c57d5dc 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_2_Ch1: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_2_Ch1 - endchannel +SFX_Cry0D_2_Ch5: + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_2_Ch5 + sound_ret -SFX_Cry0D_2_Ch2: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel +SFX_Cry0D_2_Ch6: + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_2_Ch3: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel +SFX_Cry0D_2_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index ce26e7e5..be354add 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_3_Ch1: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_3_Ch1 - endchannel +SFX_Cry0D_3_Ch5: + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_3_Ch5 + sound_ret -SFX_Cry0D_3_Ch2: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel +SFX_Cry0D_3_Ch6: + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_3_Ch3: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel +SFX_Cry0D_3_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index c30aaf20..183280e2 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_1_Ch1: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel +SFX_Cry0E_1_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_1_Ch2: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel +SFX_Cry0E_1_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_1_Ch3: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel +SFX_Cry0E_1_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 194fb04b..905adbb3 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_2_Ch1: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel +SFX_Cry0E_2_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_2_Ch2: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel +SFX_Cry0E_2_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_2_Ch3: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel +SFX_Cry0E_2_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 062e8970..a17dc577 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_3_Ch1: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel +SFX_Cry0E_3_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_3_Ch2: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel +SFX_Cry0E_3_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_3_Ch3: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel +SFX_Cry0E_3_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 1646d4b5..2cf79d6d 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_1_Ch1: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Cry0F_1_Ch5: + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_1_Ch2: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel +SFX_Cry0F_1_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_1_Ch3: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel +SFX_Cry0F_1_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 6058e7cc..39f70bfe 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_2_Ch1: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Cry0F_2_Ch5: + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_2_Ch2: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel +SFX_Cry0F_2_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_2_Ch3: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel +SFX_Cry0F_2_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 113f5ed1..f96df482 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_3_Ch1: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Cry0F_3_Ch5: + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_3_Ch2: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel +SFX_Cry0F_3_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_3_Ch3: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel +SFX_Cry0F_3_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 5199b973..dc8d2b71 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,31 +1,31 @@ -SFX_Cry10_1_Ch1: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel +SFX_Cry10_1_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_1_Ch2: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel +SFX_Cry10_1_Ch6: + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_1_Ch3: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel +SFX_Cry10_1_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 789c61b1..f026f7c1 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,31 +1,31 @@ -SFX_Cry10_2_Ch1: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel +SFX_Cry10_2_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_2_Ch2: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel +SFX_Cry10_2_Ch6: + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_2_Ch3: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel +SFX_Cry10_2_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 83980fc7..4b494b60 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,31 +1,31 @@ -SFX_Cry10_3_Ch1: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel +SFX_Cry10_3_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_3_Ch2: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel +SFX_Cry10_3_Ch6: + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_3_Ch3: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel +SFX_Cry10_3_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index d7e0b0f9..09fa8123 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,34 +1,34 @@ -SFX_Cry11_1_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel +SFX_Cry11_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_1_Ch2: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel +SFX_Cry11_1_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_1_Ch3: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry11_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index f46580eb..b51b01c1 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,34 +1,34 @@ -SFX_Cry11_2_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel +SFX_Cry11_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_2_Ch2: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel +SFX_Cry11_2_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_2_Ch3: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry11_2_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index c07e01a5..1a8b0c10 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,34 +1,34 @@ -SFX_Cry11_3_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel +SFX_Cry11_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_3_Ch2: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel +SFX_Cry11_3_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_3_Ch3: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry11_3_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index 62956626..d2ee5f6e 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,24 +1,24 @@ -SFX_Cry12_1_Ch1: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel +SFX_Cry12_1_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_1_Ch2: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel +SFX_Cry12_1_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_1_Ch3: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel +SFX_Cry12_1_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4acb8911..8a4afa2a 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,24 +1,24 @@ -SFX_Cry12_2_Ch1: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel +SFX_Cry12_2_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_2_Ch2: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel +SFX_Cry12_2_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_2_Ch3: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel +SFX_Cry12_2_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index bb433ac9..b114cdf4 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,24 +1,24 @@ -SFX_Cry12_3_Ch1: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel +SFX_Cry12_3_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_3_Ch2: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel +SFX_Cry12_3_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_3_Ch3: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel +SFX_Cry12_3_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 7f9ef226..7ba33d8d 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,30 +1,30 @@ -SFX_Cry13_1_Ch1: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel +SFX_Cry13_1_Ch5: + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_1_Ch2: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel +SFX_Cry13_1_Ch6: + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_1_Ch3: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Cry13_1_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 35d723dd..31ba80a1 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,30 +1,30 @@ -SFX_Cry13_2_Ch1: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel +SFX_Cry13_2_Ch5: + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_2_Ch2: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel +SFX_Cry13_2_Ch6: + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_2_Ch3: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Cry13_2_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index a298e5ff..8ca4cb0b 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,30 +1,30 @@ -SFX_Cry13_3_Ch1: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel +SFX_Cry13_3_Ch5: + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_3_Ch2: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel +SFX_Cry13_3_Ch6: + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_3_Ch3: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Cry13_3_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index b3cb43b9..d892918f 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,21 +1,21 @@ -SFX_Cry14_1_Ch1: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel +SFX_Cry14_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_1_Ch2: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel +SFX_Cry14_1_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_1_Ch3: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry14_1_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index d243bcbd..040bfe10 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,21 +1,21 @@ -SFX_Cry14_2_Ch1: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel +SFX_Cry14_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_2_Ch2: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel +SFX_Cry14_2_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_2_Ch3: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry14_2_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index b1a32bc4..142707c5 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,21 +1,21 @@ -SFX_Cry14_3_Ch1: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel +SFX_Cry14_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_3_Ch2: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel +SFX_Cry14_3_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_3_Ch3: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry14_3_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 4ebd4963..473d46cb 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,30 +1,30 @@ -SFX_Cry15_1_Ch1: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel +SFX_Cry15_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_1_Ch2: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel +SFX_Cry15_1_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_1_Ch3: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel +SFX_Cry15_1_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 77807203..82398789 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,30 +1,30 @@ -SFX_Cry15_2_Ch1: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel +SFX_Cry15_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_2_Ch2: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel +SFX_Cry15_2_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_2_Ch3: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel +SFX_Cry15_2_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 2c24d658..dcd6683b 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,30 +1,30 @@ -SFX_Cry15_3_Ch1: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel +SFX_Cry15_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_3_Ch2: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel +SFX_Cry15_3_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_3_Ch3: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel +SFX_Cry15_3_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 8a7ee4c1..410ec4ad 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,21 +1,21 @@ -SFX_Cry16_1_Ch1: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel +SFX_Cry16_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_1_Ch2: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel +SFX_Cry16_1_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_1_Ch3: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel +SFX_Cry16_1_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 46729c2a..a91355a6 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,21 +1,21 @@ -SFX_Cry16_2_Ch1: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel +SFX_Cry16_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_2_Ch2: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel +SFX_Cry16_2_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_2_Ch3: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel +SFX_Cry16_2_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index a94ac495..838a4241 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,21 +1,21 @@ -SFX_Cry16_3_Ch1: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel +SFX_Cry16_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_3_Ch2: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel +SFX_Cry16_3_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_3_Ch3: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel +SFX_Cry16_3_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index ddf0967d..dcfde2bc 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,24 +1,24 @@ -SFX_Cry17_1_Ch1: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel +SFX_Cry17_1_Ch5: + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_1_Ch2: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel +SFX_Cry17_1_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_1_Ch3: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel +SFX_Cry17_1_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index f2528875..f2b1f366 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,24 +1,24 @@ -SFX_Cry17_2_Ch1: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel +SFX_Cry17_2_Ch5: + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_2_Ch2: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel +SFX_Cry17_2_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_2_Ch3: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel +SFX_Cry17_2_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index f180a3b8..dabb4dbc 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,24 +1,24 @@ -SFX_Cry17_3_Ch1: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel +SFX_Cry17_3_Ch5: + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_3_Ch2: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel +SFX_Cry17_3_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_3_Ch3: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel +SFX_Cry17_3_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index c28bf7f4..c67f03d1 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,34 +1,34 @@ -SFX_Cry18_1_Ch1: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel +SFX_Cry18_1_Ch5: + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_1_Ch2: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel +SFX_Cry18_1_Ch6: + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_1_Ch3: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Cry18_1_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 1c3c26b9..55be1c3f 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,34 +1,34 @@ -SFX_Cry18_2_Ch1: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel +SFX_Cry18_2_Ch5: + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_2_Ch2: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel +SFX_Cry18_2_Ch6: + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_2_Ch3: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Cry18_2_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index ceeda42f..cc0db3ec 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,34 +1,34 @@ -SFX_Cry18_3_Ch1: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel +SFX_Cry18_3_Ch5: + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_3_Ch2: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel +SFX_Cry18_3_Ch6: + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_3_Ch3: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Cry18_3_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 4b5b4ed0..eca89a1c 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,18 +1,18 @@ -SFX_Cry19_1_Ch1: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel +SFX_Cry19_1_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_1_Ch2: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 +SFX_Cry19_1_Ch6: + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_1_Ch3: - endchannel +SFX_Cry19_1_Ch8: + sound_ret diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 9c9557a9..3a7d51fd 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,18 +1,18 @@ -SFX_Cry19_2_Ch1: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel +SFX_Cry19_2_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_2_Ch2: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 +SFX_Cry19_2_Ch6: + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_2_Ch3: - endchannel +SFX_Cry19_2_Ch8: + sound_ret diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 71eccbf8..965e6cf0 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,18 +1,18 @@ -SFX_Cry19_3_Ch1: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel +SFX_Cry19_3_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_3_Ch2: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 +SFX_Cry19_3_Ch6: + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_3_Ch3: - endchannel +SFX_Cry19_3_Ch8: + sound_ret diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 7f8911c7..f319878a 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_1_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel +SFX_Cry1A_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_1_Ch2: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel +SFX_Cry1A_1_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_1_Ch3: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry1A_1_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index da54ff6e..64fd0674 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_2_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel +SFX_Cry1A_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_2_Ch2: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel +SFX_Cry1A_2_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_2_Ch3: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry1A_2_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index d16cf035..a55f0dcf 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_3_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel +SFX_Cry1A_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_3_Ch2: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel +SFX_Cry1A_3_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_3_Ch3: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Cry1A_3_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index f6f03c98..0070a0f1 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_1_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel +SFX_Cry1B_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_1_Ch2: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel +SFX_Cry1B_1_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_1_Ch3: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel +SFX_Cry1B_1_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index fe96943d..9453ce9b 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_2_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel +SFX_Cry1B_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_2_Ch2: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel +SFX_Cry1B_2_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_2_Ch3: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel +SFX_Cry1B_2_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 8a034b1e..f6a1d76a 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_3_Ch1: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel +SFX_Cry1B_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_3_Ch2: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel +SFX_Cry1B_3_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_3_Ch3: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel +SFX_Cry1B_3_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 1561353e..929835a5 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_1_Ch1: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel +SFX_Cry1C_1_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_1_Ch2: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel +SFX_Cry1C_1_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_1_Ch3: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel +SFX_Cry1C_1_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index c589a24d..c9f23916 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_2_Ch1: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel +SFX_Cry1C_2_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_2_Ch2: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel +SFX_Cry1C_2_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_2_Ch3: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel +SFX_Cry1C_2_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 930e3368..7b18f038 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_3_Ch1: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel +SFX_Cry1C_3_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_3_Ch2: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel +SFX_Cry1C_3_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_3_Ch3: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel +SFX_Cry1C_3_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6b8b3f79..a532ec5c 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_1_Ch1: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel +SFX_Cry1D_1_Ch5: + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_1_Ch2: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel +SFX_Cry1D_1_Ch6: + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_1_Ch3: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Cry1D_1_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 31fccb8d..c919ba1e 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_2_Ch1: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel +SFX_Cry1D_2_Ch5: + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_2_Ch2: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel +SFX_Cry1D_2_Ch6: + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_2_Ch3: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Cry1D_2_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index fbbe9ca5..47e38997 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_3_Ch1: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel +SFX_Cry1D_3_Ch5: + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_3_Ch2: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel +SFX_Cry1D_3_Ch6: + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_3_Ch3: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Cry1D_3_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 9501a06a..19634a5e 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_1_Ch1: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel +SFX_Cry1E_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_1_Ch2: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel +SFX_Cry1E_1_Ch6: + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_1_Ch3: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel +SFX_Cry1E_1_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index fe112101..74004489 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_2_Ch1: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel +SFX_Cry1E_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_2_Ch2: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel +SFX_Cry1E_2_Ch6: + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_2_Ch3: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel +SFX_Cry1E_2_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index f5bdbe08..357c2f71 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_3_Ch1: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel +SFX_Cry1E_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_3_Ch2: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel +SFX_Cry1E_3_Ch6: + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_3_Ch3: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel +SFX_Cry1E_3_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 28b91c61..1f5b3a8d 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_1_Ch1: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel +SFX_Cry1F_1_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_1_Ch2: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel +SFX_Cry1F_1_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_1_Ch3: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel +SFX_Cry1F_1_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 9691654f..99f3a056 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_2_Ch1: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel +SFX_Cry1F_2_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_2_Ch2: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel +SFX_Cry1F_2_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_2_Ch3: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel +SFX_Cry1F_2_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 3c50327b..c9cf5441 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_3_Ch1: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel +SFX_Cry1F_3_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_3_Ch2: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel +SFX_Cry1F_3_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_3_Ch3: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel +SFX_Cry1F_3_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 0e9ffb00..15a160ae 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,24 +1,24 @@ -SFX_Cry20_1_Ch1: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel +SFX_Cry20_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_1_Ch2: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel +SFX_Cry20_1_Ch6: + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_1_Ch3: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel +SFX_Cry20_1_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 91891b4f..281e478c 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,24 +1,24 @@ -SFX_Cry20_2_Ch1: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel +SFX_Cry20_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_2_Ch2: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel +SFX_Cry20_2_Ch6: + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_2_Ch3: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel +SFX_Cry20_2_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 1fae1bb3..8191ca6e 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,24 +1,24 @@ -SFX_Cry20_3_Ch1: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel +SFX_Cry20_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_3_Ch2: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel +SFX_Cry20_3_Ch6: + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_3_Ch3: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel +SFX_Cry20_3_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 17d1e16c..2cf517a8 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,27 +1,27 @@ -SFX_Cry21_1_Ch1: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel +SFX_Cry21_1_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_1_Ch2: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 +SFX_Cry21_1_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_1_Ch3: - endchannel +SFX_Cry21_1_Ch8: + sound_ret diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index 14856fc9..8136de63 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,27 +1,27 @@ -SFX_Cry21_2_Ch1: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel +SFX_Cry21_2_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_2_Ch2: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 +SFX_Cry21_2_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_2_Ch3: - endchannel +SFX_Cry21_2_Ch8: + sound_ret diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 40cbf7f2..d829f9f2 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,27 +1,27 @@ -SFX_Cry21_3_Ch1: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel +SFX_Cry21_3_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_3_Ch2: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 +SFX_Cry21_3_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_3_Ch3: - endchannel +SFX_Cry21_3_Ch8: + sound_ret diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index fb0c6b23..dd910103 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,24 +1,24 @@ -SFX_Cry22_1_Ch1: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel +SFX_Cry22_1_Ch5: + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_1_Ch2: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel +SFX_Cry22_1_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_1_Ch3: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel +SFX_Cry22_1_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 7653234e..43e09d67 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,24 +1,24 @@ -SFX_Cry22_2_Ch1: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel +SFX_Cry22_2_Ch5: + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_2_Ch2: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel +SFX_Cry22_2_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_2_Ch3: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel +SFX_Cry22_2_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 96fae832..397edba1 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,24 +1,24 @@ -SFX_Cry22_3_Ch1: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel +SFX_Cry22_3_Ch5: + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_3_Ch2: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel +SFX_Cry22_3_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_3_Ch3: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel +SFX_Cry22_3_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 4aaa3bfa..5aeafe0f 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,25 +1,25 @@ -SFX_Cry23_1_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel +SFX_Cry23_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_1_Ch2: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel +SFX_Cry23_1_Ch6: + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_1_Ch3: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Cry23_1_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 644b14cf..04e4136b 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,25 +1,25 @@ -SFX_Cry23_2_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel +SFX_Cry23_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_2_Ch2: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel +SFX_Cry23_2_Ch6: + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_2_Ch3: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Cry23_2_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index d86dfcd4..418e69bb 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,25 +1,25 @@ -SFX_Cry23_3_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel +SFX_Cry23_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_3_Ch2: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel +SFX_Cry23_3_Ch6: + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_3_Ch3: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Cry23_3_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index a94803c1..7e992707 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,33 +1,33 @@ -SFX_Cry24_1_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Cry24_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_1_Ch2: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel +SFX_Cry24_1_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_1_Ch3: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Cry24_1_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index cc8b2f87..d845f6ed 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,33 +1,33 @@ -SFX_Cry24_2_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Cry24_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_2_Ch2: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel +SFX_Cry24_2_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_2_Ch3: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Cry24_2_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 37926146..e8c1f24e 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,33 +1,33 @@ -SFX_Cry24_3_Ch1: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Cry24_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_3_Ch2: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel +SFX_Cry24_3_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_3_Ch3: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Cry24_3_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index d54b8d6c..64d59389 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,26 +1,26 @@ -SFX_Cry25_1_Ch1: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel +SFX_Cry25_1_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_1_Ch2: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel +SFX_Cry25_1_Ch6: + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_1_Ch3: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel +SFX_Cry25_1_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 48e4d057..8ed47006 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,26 +1,26 @@ -SFX_Cry25_2_Ch1: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel +SFX_Cry25_2_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_2_Ch2: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel +SFX_Cry25_2_Ch6: + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_2_Ch3: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel +SFX_Cry25_2_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index f08c6a00..f9800dc8 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,26 +1,26 @@ -SFX_Cry25_3_Ch1: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel +SFX_Cry25_3_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_3_Ch2: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel +SFX_Cry25_3_Ch6: + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_3_Ch3: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel +SFX_Cry25_3_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index a42cd660..fd53e240 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ -SFX_Cut_1_Ch1: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel +SFX_Cut_1_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 12c2366e..b223b99b 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ -SFX_Cut_3_Ch1: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel +SFX_Cut_3_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm deleted file mode 100644 index 3f3c6d8b..00000000 --- a/audio/sfx/cymbal1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_1_Ch1: - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm deleted file mode 100644 index bb1e3e3e..00000000 --- a/audio/sfx/cymbal1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_2_Ch1: - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm deleted file mode 100644 index 9587977f..00000000 --- a/audio/sfx/cymbal1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_3_Ch1: - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/cymbal1_4.asm b/audio/sfx/cymbal1_4.asm deleted file mode 100644 index bd941ef5..00000000 --- a/audio/sfx/cymbal1_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Cymbal1_4_Ch7: - unknownnoise0x20 0, 161, 16 - endchannel - diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm deleted file mode 100644 index 2ec3fc86..00000000 --- a/audio/sfx/cymbal2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_1_Ch1: - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm deleted file mode 100644 index 8b27a0de..00000000 --- a/audio/sfx/cymbal2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_2_Ch1: - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm deleted file mode 100644 index 642a336a..00000000 --- a/audio/sfx/cymbal2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_3_Ch1: - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/cymbal2_4.asm b/audio/sfx/cymbal2_4.asm deleted file mode 100644 index b33e10fc..00000000 --- a/audio/sfx/cymbal2_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Cymbal2_4_Ch7: - unknownnoise0x20 0, 162, 17 - endchannel - diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm deleted file mode 100644 index 3fd225e2..00000000 --- a/audio/sfx/cymbal3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_1_Ch1: - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm deleted file mode 100644 index 1435b5ed..00000000 --- a/audio/sfx/cymbal3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_2_Ch1: - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm deleted file mode 100644 index b45fb03d..00000000 --- a/audio/sfx/cymbal3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_3_Ch1: - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/cymbal3_4.asm b/audio/sfx/cymbal3_4.asm deleted file mode 100644 index b5e99c56..00000000 --- a/audio/sfx/cymbal3_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Cymbal3_4_Ch7: - unknownnoise0x20 0, 162, 80 - endchannel - diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index ea2727d8..5e0665f6 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ -SFX_Damage_Ch1: - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 2, 244, 20 - unknownnoise0x20 15, 241, 50 - endchannel +SFX_Damage_Ch8: + noise_note 2, 15, 4, 68 + noise_note 2, 15, 4, 20 + noise_note 15, 15, 1, 50 + sound_ret diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index d954308a..2c132003 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ -SFX_Denied_1_Ch1: - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Denied_1_Ch5: + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret -SFX_Denied_1_Ch2: - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Denied_1_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index ca82a739..56a0753f 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,18 +1,18 @@ -SFX_Denied_3_Ch1: - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Denied_3_Ch5: + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret -SFX_Denied_3_Ch2: - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Denied_3_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 6e3a0dcf..555b3beb 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ -SFX_Dex_Page_Added_Ch1: - duty 2 - unknownsfx0x10 68 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel +SFX_Dex_Page_Added_Ch5: + duty_cycle 2 + pitch_sweep 4, 4 + square_note 15, 15, 0, 1264 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret -SFX_Dex_Page_Added_Ch2: - duty 2 - unknownsfx0x20 15, 146, 0, 6 - unknownsfx0x20 15, 146, 130, 7 - endchannel +SFX_Dex_Page_Added_Ch6: + duty_cycle 2 + square_note 15, 9, 2, 1536 + square_note 15, 9, 2, 1922 + sound_ret diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 5cae0a4b..14638602 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: - unknownnoise0x20 8, 241, 50 - unknownnoise0x20 8, 241, 51 - endchannel +SFX_Doubleslap_Ch8: + noise_note 8, 15, 1, 50 + noise_note 8, 15, 1, 51 + sound_ret diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index b2450ced..30c3ecd1 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_1_Ch1: - duty 2 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Enter_PC_1_Ch5: + duty_cycle 2 + square_note 6, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 6, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 061068ce..9c741798 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_3_Ch1: - duty 2 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Enter_PC_3_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 4, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd1b2cdc..47f45037 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ -SFX_Faint_Fall_Ch1: - duty 1 - unknownsfx0x10 175 - unknownsfx0x20 15, 242, 128, 7 - unknownsfx0x10 8 - endchannel +SFX_Faint_Fall_Ch5: + duty_cycle 1 + pitch_sweep 10, -7 + square_note 15, 15, 2, 1920 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 7b6ec0a0..527e027f 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ -SFX_Faint_Thud_Ch1: - unknownsfx0x20 15, 209, 0, 2 - unknownsfx0x10 8 - endchannel +SFX_Faint_Thud_Ch5: + square_note 15, 13, 1, 512 + pitch_sweep 0, 8 + sound_ret -SFX_Faint_Thud_Ch2: - unknownnoise0x20 4, 245, 51 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 - endchannel +SFX_Faint_Thud_Ch8: + noise_note 4, 15, 5, 51 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 2b487bc2..40ebb966 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ -SFX_Fly_1_Ch1: - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel +SFX_Fly_1_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index c081030d..e29b5654 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ -SFX_Fly_3_Ch1: - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel +SFX_Fly_3_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index ba428722..09f76c70 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_1_Ch1: - executemusic +SFX_Get_Item1_1_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_Get_Item1_1_Ch2: - executemusic +SFX_Get_Item1_1_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret -SFX_Get_Item1_1_Ch3: - executemusic - notetype 4, 1, 0 +SFX_Get_Item1_1_Ch7: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index b30ce40c..dfc1848f 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_3_Ch1: - executemusic +SFX_Get_Item1_3_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_Get_Item1_3_Ch2: - executemusic +SFX_Get_Item1_3_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret -SFX_Get_Item1_3_Ch3: - executemusic - notetype 4, 1, 0 +SFX_Get_Item1_3_Ch7: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/get_item1_4.asm b/audio/sfx/get_item1_4.asm new file mode 100644 index 00000000..3fc984c5 --- /dev/null +++ b/audio/sfx/get_item1_4.asm @@ -0,0 +1,47 @@ +SFX_Get_Item1_4_Ch5: + execute_music + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 + octave 4 + note E_, 4 + sound_ret + + +SFX_Get_Item1_4_Ch6: + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 4, 12, 1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret + + +SFX_Get_Item1_4_Ch7: + execute_music + note_type 4, 1, 0 + octave 4 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note_type 12, 1, 0 + octave 4 + note B_, 2 + rest 2 + sound_ret diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 67bb7bb8..04bbdae2 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_1_Ch1: - executemusic +SFX_Get_Item2_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_1_Ch2: - executemusic +SFX_Get_Item2_1_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_1_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 292a74f6..f05e0728 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_2_Ch1: - executemusic +SFX_Get_Item2_2_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_2_Ch2: - executemusic +SFX_Get_Item2_2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_2_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_2_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 1a833741..036d375b 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_3_Ch1: - executemusic +SFX_Get_Item2_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_3_Ch2: - executemusic +SFX_Get_Item2_3_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_3_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_3_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_4.asm b/audio/sfx/get_item2_4.asm index b2909739..33681fb2 100644 --- a/audio/sfx/get_item2_4.asm +++ b/audio/sfx/get_item2_4.asm @@ -1,67 +1,69 @@ -SFX_80ec8_4_Ch4: - executemusic +SFX_Get_Item2_4_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_80ee7_4_Ch5: - executemusic + +SFX_Get_Item2_4_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret + -SFX_80eff_4_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_4_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_4_2.asm b/audio/sfx/get_item2_4_2.asm index 4f7e38eb..04ca9f21 100644 --- a/audio/sfx/get_item2_4_2.asm +++ b/audio/sfx/get_item2_4_2.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_4_2_Ch1: - executemusic +SFX_Get_Item2_4_2_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_4_2_Ch2: - executemusic +SFX_Get_Item2_4_2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_4_2_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_4_2_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index c8da1745..a19f1143 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_1_Ch1: - executemusic +SFX_Get_Key_Item_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + note_type 5, 11, 1 octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel + note C_, 2 + note C_, 1 + note C_, 1 + note_type 5, 10, 4 + note D#, 4 + note_type 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note_type 5, 11, 4 + note A#, 8 + sound_ret -SFX_Get_Key_Item_1_Ch2: - executemusic +SFX_Get_Key_Item_1_Ch6: + execute_music vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + duty_cycle 2 + note_type 5, 13, 1 octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 + note G_, 2 + note G_, 1 + note G_, 1 + note_type 5, 12, 4 + note D#, 4 + note_type 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + note_type 5, 12, 4 octave 5 - D# 8 - endchannel + note D#, 8 + sound_ret -SFX_Get_Key_Item_1_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Get_Key_Item_1_Ch7: + execute_music + note_type 5, 1, 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + sound_ret diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index e6a50929..c1063a7f 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_3_Ch1: - executemusic +SFX_Get_Key_Item_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + note_type 5, 11, 1 octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel + note C_, 2 + note C_, 1 + note C_, 1 + note_type 5, 10, 4 + note D#, 4 + note_type 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note_type 5, 11, 4 + note A#, 8 + sound_ret -SFX_Get_Key_Item_3_Ch2: - executemusic +SFX_Get_Key_Item_3_Ch6: + execute_music vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + duty_cycle 2 + note_type 5, 13, 1 octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 + note G_, 2 + note G_, 1 + note G_, 1 + note_type 5, 12, 4 + note D#, 4 + note_type 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + note_type 5, 12, 4 octave 5 - D# 8 - endchannel + note D#, 8 + sound_ret -SFX_Get_Key_Item_3_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Get_Key_Item_3_Ch7: + execute_music + note_type 5, 1, 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + sound_ret diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 5da5be86..b41dc94d 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel +SFX_Go_Inside_1_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 460b3b4a..5aab6564 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel +SFX_Go_Inside_3_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 2038d299..2ac3542b 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_1_Ch1: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel +SFX_Go_Outside_1_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index d45b8410..cd3543f2 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_3_Ch1: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel +SFX_Go_Outside_3_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 3a292b82..88a92881 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_1_Ch1: - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel +SFX_Heal_Ailment_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 25e1bbe0..6e3e68d9 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_2_Ch1: - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel +SFX_Heal_Ailment_2_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index 2719358f..660d9abe 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_3_Ch1: - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel +SFX_Heal_Ailment_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_ailment_4.asm b/audio/sfx/heal_ailment_4.asm deleted file mode 100755 index fd80517d..00000000 --- a/audio/sfx/heal_ailment_4.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_8027f_4_Ch4: - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index a23db490..8dafb807 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_1_Ch1: - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel +SFX_Heal_HP_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index f21f6712..9eef9472 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_2_Ch1: - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel +SFX_Heal_HP_2_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index 96ff391b..22651532 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_3_Ch1: - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel +SFX_Heal_HP_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ecb7c09c..9350ffd3 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_1_Ch1: - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 8 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index ec73e139..5df3856b 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_3_Ch1: - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_3_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 8 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index b1af527b..32541241 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ -SFX_Horn_Drill_Ch1: - unknownnoise0x20 3, 146, 49 - unknownnoise0x20 3, 178, 50 - unknownnoise0x20 3, 194, 51 - unknownnoise0x20 8, 241, 84 - endchannel +SFX_Horn_Drill_Ch8: + noise_note 3, 9, 2, 49 + noise_note 3, 11, 2, 50 + noise_note 3, 12, 2, 51 + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 69d6ff9b..703edf41 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 - endchannel +SFX_Intro_Crash_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 3d6de9d6..3d0f6642 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hip_Ch1: - duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 64, 7 - unknownsfx0x10 8 - endchannel +SFX_Intro_Hip_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1856 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 8e077c67..9c7c1ad6 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hop_Ch1: - duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 128, 6 - unknownsfx0x10 8 - endchannel +SFX_Intro_Hop_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1664 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index cb7570de..ee41e37c 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ -SFX_Intro_Lunge_Ch1: - unknownnoise0x20 6, 32, 16 - unknownnoise0x20 6, 47, 64 - unknownnoise0x20 6, 79, 65 - unknownnoise0x20 6, 143, 65 - unknownnoise0x20 6, 207, 66 - unknownnoise0x20 8, 215, 66 - unknownnoise0x20 15, 231, 67 - unknownnoise0x20 15, 242, 67 - endchannel +SFX_Intro_Lunge_Ch8: + noise_note 6, 2, 0, 16 + noise_note 6, 2, -7, 64 + noise_note 6, 4, -7, 65 + noise_note 6, 8, -7, 65 + noise_note 6, 12, -7, 66 + noise_note 8, 13, 7, 66 + noise_note 15, 14, 7, 67 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index 0088228f..1985878b 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ -SFX_Intro_Raise_Ch1: - unknownnoise0x20 2, 111, 33 - unknownnoise0x20 2, 175, 49 - unknownnoise0x20 15, 242, 65 - endchannel +SFX_Intro_Raise_Ch8: + noise_note 2, 6, -7, 33 + noise_note 2, 10, -7, 49 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 5609bfc0..68ba128a 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ -SFX_Intro_Whoosh_Ch1: - unknownnoise0x20 4, 44, 32 - unknownnoise0x20 3, 160, 32 - unknownnoise0x20 3, 176, 33 - unknownnoise0x20 3, 192, 34 - unknownnoise0x20 15, 210, 36 - endchannel +SFX_Intro_Whoosh_Ch8: + noise_note 4, 2, -4, 32 + noise_note 3, 10, 0, 32 + noise_note 3, 11, 0, 33 + noise_note 3, 12, 0, 34 + noise_note 15, 13, 2, 36 + sound_ret diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 72aa087e..dd798f40 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ -SFX_Ledge_1_Ch1: - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel +SFX_Ledge_1_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index a554282e..c218ee1b 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ -SFX_Ledge_3_Ch1: - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel +SFX_Ledge_3_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index f0890eab..f1af4978 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,63 +1,63 @@ -SFX_Level_Up_Ch1: - executemusic +SFX_Level_Up_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 6, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 4 octave 4 - F_ 4 - notetype 4, 11, 2 - C_ 2 - F_ 2 - C_ 2 - notetype 6, 11, 3 - D# 2 - D# 2 - E_ 2 - notetype 6, 11, 4 - F_ 8 - endchannel + note F_, 4 + note_type 4, 11, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note_type 6, 11, 3 + note D#, 2 + note D#, 2 + note E_, 2 + note_type 6, 11, 4 + note F_, 8 + sound_ret -SFX_Level_Up_Ch2: - executemusic +SFX_Level_Up_Ch6: + execute_music vibrato 4, 2, 2 - duty 2 - notetype 6, 12, 4 + duty_cycle 2 + note_type 6, 12, 4 octave 4 - A_ 4 - notetype 4, 12, 2 - A_ 2 - A_ 2 - A_ 2 - notetype 6, 12, 4 - A# 2 - A# 2 - A# 2 - notetype 6, 12, 4 - A_ 8 - endchannel + note A_, 4 + note_type 4, 12, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note_type 6, 12, 4 + note A#, 2 + note A#, 2 + note A#, 2 + note_type 6, 12, 4 + note A_, 8 + sound_ret -SFX_Level_Up_Ch3: - executemusic - notetype 6, 1, 0 +SFX_Level_Up_Ch7: + execute_music + note_type 6, 1, 0 octave 5 - A_ 4 - notetype 4, 1, 0 - F_ 1 + note A_, 4 + note_type 4, 1, 0 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - notetype 6, 1, 0 - G_ 1 + note_type 6, 1, 0 + note G_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm deleted file mode 100644 index b29a5b87..00000000 --- a/audio/sfx/muted_snare1_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_1_Ch1: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm deleted file mode 100644 index a7f5467f..00000000 --- a/audio/sfx/muted_snare1_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_2_Ch1: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm deleted file mode 100644 index 136018ef..00000000 --- a/audio/sfx/muted_snare1_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_3_Ch1: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/muted_snare1_4.asm b/audio/sfx/muted_snare1_4.asm deleted file mode 100644 index bcf8c54b..00000000 --- a/audio/sfx/muted_snare1_4.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_Muted_Snare1_4_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel - diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm deleted file mode 100644 index 9ad52c27..00000000 --- a/audio/sfx/muted_snare2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_1_Ch1: - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm deleted file mode 100644 index 20670ec8..00000000 --- a/audio/sfx/muted_snare2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_2_Ch1: - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm deleted file mode 100644 index 007d462d..00000000 --- a/audio/sfx/muted_snare2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_3_Ch1: - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/muted_snare2_4.asm b/audio/sfx/muted_snare2_4.asm deleted file mode 100644 index 8934afe2..00000000 --- a/audio/sfx/muted_snare2_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare2_4_Ch7: - unknownnoise0x20 0, 145, 34 - endchannel - diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm deleted file mode 100644 index 8db6b874..00000000 --- a/audio/sfx/muted_snare3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_1_Ch1: - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm deleted file mode 100644 index 013ea9ab..00000000 --- a/audio/sfx/muted_snare3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_2_Ch1: - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm deleted file mode 100644 index 038a66db..00000000 --- a/audio/sfx/muted_snare3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_3_Ch1: - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/muted_snare3_4.asm b/audio/sfx/muted_snare3_4.asm deleted file mode 100644 index beeec087..00000000 --- a/audio/sfx/muted_snare3_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare3_4_Ch7: - unknownnoise0x20 0, 113, 34 - endchannel - diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm deleted file mode 100644 index 99429995..00000000 --- a/audio/sfx/muted_snare4_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_1_Ch1: - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm deleted file mode 100644 index 11ee3218..00000000 --- a/audio/sfx/muted_snare4_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_2_Ch1: - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm deleted file mode 100644 index 86223813..00000000 --- a/audio/sfx/muted_snare4_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_3_Ch1: - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/muted_snare4_4.asm b/audio/sfx/muted_snare4_4.asm deleted file mode 100644 index 7fc65086..00000000 --- a/audio/sfx/muted_snare4_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare4_4_Ch7: - unknownnoise0x20 0, 97, 34 - endchannel - diff --git a/audio/sfx/noise_instrument01_1.asm b/audio/sfx/noise_instrument01_1.asm new file mode 100644 index 00000000..e545b030 --- /dev/null +++ b/audio/sfx/noise_instrument01_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_1_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_2.asm b/audio/sfx/noise_instrument01_2.asm new file mode 100644 index 00000000..3f4d2bb0 --- /dev/null +++ b/audio/sfx/noise_instrument01_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_2_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_3.asm b/audio/sfx/noise_instrument01_3.asm new file mode 100644 index 00000000..ac360f2e --- /dev/null +++ b/audio/sfx/noise_instrument01_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_3_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument01_4.asm b/audio/sfx/noise_instrument01_4.asm new file mode 100755 index 00000000..9b7aaadb --- /dev/null +++ b/audio/sfx/noise_instrument01_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument01_4_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_1.asm b/audio/sfx/noise_instrument02_1.asm new file mode 100644 index 00000000..12a7d226 --- /dev/null +++ b/audio/sfx/noise_instrument02_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_1_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_2.asm b/audio/sfx/noise_instrument02_2.asm new file mode 100644 index 00000000..354bbdbc --- /dev/null +++ b/audio/sfx/noise_instrument02_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_2_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_3.asm b/audio/sfx/noise_instrument02_3.asm new file mode 100644 index 00000000..2f7f0d6f --- /dev/null +++ b/audio/sfx/noise_instrument02_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_3_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument02_4.asm b/audio/sfx/noise_instrument02_4.asm new file mode 100755 index 00000000..769e1610 --- /dev/null +++ b/audio/sfx/noise_instrument02_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument02_4_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_1.asm b/audio/sfx/noise_instrument03_1.asm new file mode 100644 index 00000000..b75b6479 --- /dev/null +++ b/audio/sfx/noise_instrument03_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_1_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_2.asm b/audio/sfx/noise_instrument03_2.asm new file mode 100644 index 00000000..3551baef --- /dev/null +++ b/audio/sfx/noise_instrument03_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_2_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_3.asm b/audio/sfx/noise_instrument03_3.asm new file mode 100644 index 00000000..c132ab64 --- /dev/null +++ b/audio/sfx/noise_instrument03_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_3_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument03_4.asm b/audio/sfx/noise_instrument03_4.asm new file mode 100755 index 00000000..d4a0535d --- /dev/null +++ b/audio/sfx/noise_instrument03_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument03_4_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_1.asm b/audio/sfx/noise_instrument04_1.asm new file mode 100644 index 00000000..303f1f1f --- /dev/null +++ b/audio/sfx/noise_instrument04_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_1_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_2.asm b/audio/sfx/noise_instrument04_2.asm new file mode 100644 index 00000000..b43ae39d --- /dev/null +++ b/audio/sfx/noise_instrument04_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_2_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_3.asm b/audio/sfx/noise_instrument04_3.asm new file mode 100644 index 00000000..fcd27433 --- /dev/null +++ b/audio/sfx/noise_instrument04_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_3_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument04_4.asm b/audio/sfx/noise_instrument04_4.asm new file mode 100644 index 00000000..5defa2de --- /dev/null +++ b/audio/sfx/noise_instrument04_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument04_4_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument05_1.asm b/audio/sfx/noise_instrument05_1.asm new file mode 100644 index 00000000..d119b958 --- /dev/null +++ b/audio/sfx/noise_instrument05_1.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_1_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_2.asm b/audio/sfx/noise_instrument05_2.asm new file mode 100644 index 00000000..1a0e63b5 --- /dev/null +++ b/audio/sfx/noise_instrument05_2.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_2_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_3.asm b/audio/sfx/noise_instrument05_3.asm new file mode 100644 index 00000000..a0fec98f --- /dev/null +++ b/audio/sfx/noise_instrument05_3.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_3_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument05_4.asm b/audio/sfx/noise_instrument05_4.asm new file mode 100644 index 00000000..6e713056 --- /dev/null +++ b/audio/sfx/noise_instrument05_4.asm @@ -0,0 +1,8 @@ +SFX_Noise_Instrument05_4_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/noise_instrument06_1.asm b/audio/sfx/noise_instrument06_1.asm new file mode 100644 index 00000000..1412fc39 --- /dev/null +++ b/audio/sfx/noise_instrument06_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_1_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_2.asm b/audio/sfx/noise_instrument06_2.asm new file mode 100644 index 00000000..bb591031 --- /dev/null +++ b/audio/sfx/noise_instrument06_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_2_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_3.asm b/audio/sfx/noise_instrument06_3.asm new file mode 100644 index 00000000..b5110d40 --- /dev/null +++ b/audio/sfx/noise_instrument06_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_3_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument06_4.asm b/audio/sfx/noise_instrument06_4.asm new file mode 100644 index 00000000..fb7402a9 --- /dev/null +++ b/audio/sfx/noise_instrument06_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument06_4_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_1.asm b/audio/sfx/noise_instrument07_1.asm new file mode 100644 index 00000000..24f481bc --- /dev/null +++ b/audio/sfx/noise_instrument07_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_1_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_2.asm b/audio/sfx/noise_instrument07_2.asm new file mode 100644 index 00000000..87057ed1 --- /dev/null +++ b/audio/sfx/noise_instrument07_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_2_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_3.asm b/audio/sfx/noise_instrument07_3.asm new file mode 100644 index 00000000..3beb3f2c --- /dev/null +++ b/audio/sfx/noise_instrument07_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_3_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument07_4.asm b/audio/sfx/noise_instrument07_4.asm new file mode 100644 index 00000000..d6262f95 --- /dev/null +++ b/audio/sfx/noise_instrument07_4.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument07_4_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/noise_instrument08_1.asm b/audio/sfx/noise_instrument08_1.asm new file mode 100644 index 00000000..60db9e0f --- /dev/null +++ b/audio/sfx/noise_instrument08_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_1_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_2.asm b/audio/sfx/noise_instrument08_2.asm new file mode 100644 index 00000000..89e5b445 --- /dev/null +++ b/audio/sfx/noise_instrument08_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_2_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_3.asm b/audio/sfx/noise_instrument08_3.asm new file mode 100644 index 00000000..c63be9b4 --- /dev/null +++ b/audio/sfx/noise_instrument08_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_3_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument08_4.asm b/audio/sfx/noise_instrument08_4.asm new file mode 100644 index 00000000..9c3b3ba6 --- /dev/null +++ b/audio/sfx/noise_instrument08_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument08_4_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument09_1.asm b/audio/sfx/noise_instrument09_1.asm new file mode 100644 index 00000000..047f5469 --- /dev/null +++ b/audio/sfx/noise_instrument09_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_1_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_2.asm b/audio/sfx/noise_instrument09_2.asm new file mode 100644 index 00000000..093f912e --- /dev/null +++ b/audio/sfx/noise_instrument09_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_2_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_3.asm b/audio/sfx/noise_instrument09_3.asm new file mode 100644 index 00000000..2ab061db --- /dev/null +++ b/audio/sfx/noise_instrument09_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_3_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument09_4.asm b/audio/sfx/noise_instrument09_4.asm new file mode 100644 index 00000000..89839b7c --- /dev/null +++ b/audio/sfx/noise_instrument09_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument09_4_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/noise_instrument10_1.asm b/audio/sfx/noise_instrument10_1.asm new file mode 100644 index 00000000..1628fb88 --- /dev/null +++ b/audio/sfx/noise_instrument10_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_1_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_2.asm b/audio/sfx/noise_instrument10_2.asm new file mode 100644 index 00000000..e1ed23ce --- /dev/null +++ b/audio/sfx/noise_instrument10_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_2_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_3.asm b/audio/sfx/noise_instrument10_3.asm new file mode 100644 index 00000000..a175ad17 --- /dev/null +++ b/audio/sfx/noise_instrument10_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_3_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument10_4.asm b/audio/sfx/noise_instrument10_4.asm new file mode 100644 index 00000000..694fa6c7 --- /dev/null +++ b/audio/sfx/noise_instrument10_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument10_4_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/noise_instrument11_1.asm b/audio/sfx/noise_instrument11_1.asm new file mode 100644 index 00000000..e2f8729e --- /dev/null +++ b/audio/sfx/noise_instrument11_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_1_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_2.asm b/audio/sfx/noise_instrument11_2.asm new file mode 100644 index 00000000..925c421a --- /dev/null +++ b/audio/sfx/noise_instrument11_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_2_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_3.asm b/audio/sfx/noise_instrument11_3.asm new file mode 100644 index 00000000..72f54e99 --- /dev/null +++ b/audio/sfx/noise_instrument11_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_3_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument11_4.asm b/audio/sfx/noise_instrument11_4.asm new file mode 100644 index 00000000..868b73c6 --- /dev/null +++ b/audio/sfx/noise_instrument11_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument11_4_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/noise_instrument12_1.asm b/audio/sfx/noise_instrument12_1.asm new file mode 100644 index 00000000..f1e6379a --- /dev/null +++ b/audio/sfx/noise_instrument12_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_1_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_2.asm b/audio/sfx/noise_instrument12_2.asm new file mode 100644 index 00000000..f9c2e1a9 --- /dev/null +++ b/audio/sfx/noise_instrument12_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_2_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_3.asm b/audio/sfx/noise_instrument12_3.asm new file mode 100644 index 00000000..b5347639 --- /dev/null +++ b/audio/sfx/noise_instrument12_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_3_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument12_4.asm b/audio/sfx/noise_instrument12_4.asm new file mode 100644 index 00000000..1d55d4f5 --- /dev/null +++ b/audio/sfx/noise_instrument12_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument12_4_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/noise_instrument13_1.asm b/audio/sfx/noise_instrument13_1.asm new file mode 100644 index 00000000..50569b26 --- /dev/null +++ b/audio/sfx/noise_instrument13_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_1_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_2.asm b/audio/sfx/noise_instrument13_2.asm new file mode 100644 index 00000000..5a5120f6 --- /dev/null +++ b/audio/sfx/noise_instrument13_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_2_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_3.asm b/audio/sfx/noise_instrument13_3.asm new file mode 100644 index 00000000..848746d7 --- /dev/null +++ b/audio/sfx/noise_instrument13_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_3_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument13_4.asm b/audio/sfx/noise_instrument13_4.asm new file mode 100644 index 00000000..1b461841 --- /dev/null +++ b/audio/sfx/noise_instrument13_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument13_4_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/noise_instrument14_1.asm b/audio/sfx/noise_instrument14_1.asm new file mode 100644 index 00000000..9621ef42 --- /dev/null +++ b/audio/sfx/noise_instrument14_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_1_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_2.asm b/audio/sfx/noise_instrument14_2.asm new file mode 100644 index 00000000..d413fb1f --- /dev/null +++ b/audio/sfx/noise_instrument14_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_2_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_3.asm b/audio/sfx/noise_instrument14_3.asm new file mode 100644 index 00000000..bc115181 --- /dev/null +++ b/audio/sfx/noise_instrument14_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_3_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument14_4.asm b/audio/sfx/noise_instrument14_4.asm new file mode 100644 index 00000000..7d1f5734 --- /dev/null +++ b/audio/sfx/noise_instrument14_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument14_4_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/noise_instrument15_1.asm b/audio/sfx/noise_instrument15_1.asm new file mode 100644 index 00000000..308746c0 --- /dev/null +++ b/audio/sfx/noise_instrument15_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_1_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_2.asm b/audio/sfx/noise_instrument15_2.asm new file mode 100644 index 00000000..c1f63942 --- /dev/null +++ b/audio/sfx/noise_instrument15_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_2_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_3.asm b/audio/sfx/noise_instrument15_3.asm new file mode 100644 index 00000000..f77872ae --- /dev/null +++ b/audio/sfx/noise_instrument15_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_3_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument15_4.asm b/audio/sfx/noise_instrument15_4.asm new file mode 100644 index 00000000..6d25965a --- /dev/null +++ b/audio/sfx/noise_instrument15_4.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument15_4_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/noise_instrument16_1.asm b/audio/sfx/noise_instrument16_1.asm new file mode 100644 index 00000000..ac830985 --- /dev/null +++ b/audio/sfx/noise_instrument16_1.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_1_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_2.asm b/audio/sfx/noise_instrument16_2.asm new file mode 100644 index 00000000..e61531bf --- /dev/null +++ b/audio/sfx/noise_instrument16_2.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_2_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_3.asm b/audio/sfx/noise_instrument16_3.asm new file mode 100644 index 00000000..99dbca77 --- /dev/null +++ b/audio/sfx/noise_instrument16_3.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_3_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument16_4.asm b/audio/sfx/noise_instrument16_4.asm new file mode 100644 index 00000000..8a3e4808 --- /dev/null +++ b/audio/sfx/noise_instrument16_4.asm @@ -0,0 +1,4 @@ +SFX_Noise_Instrument16_4_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/noise_instrument17_1.asm b/audio/sfx/noise_instrument17_1.asm new file mode 100644 index 00000000..41565402 --- /dev/null +++ b/audio/sfx/noise_instrument17_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_1_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_2.asm b/audio/sfx/noise_instrument17_2.asm new file mode 100644 index 00000000..f89ec777 --- /dev/null +++ b/audio/sfx/noise_instrument17_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_2_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_3.asm b/audio/sfx/noise_instrument17_3.asm new file mode 100644 index 00000000..9330fbc0 --- /dev/null +++ b/audio/sfx/noise_instrument17_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_3_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument17_4.asm b/audio/sfx/noise_instrument17_4.asm new file mode 100644 index 00000000..42d04ea2 --- /dev/null +++ b/audio/sfx/noise_instrument17_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument17_4_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_1.asm b/audio/sfx/noise_instrument18_1.asm new file mode 100644 index 00000000..e77e331d --- /dev/null +++ b/audio/sfx/noise_instrument18_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_1_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_2.asm b/audio/sfx/noise_instrument18_2.asm new file mode 100644 index 00000000..e937f9f6 --- /dev/null +++ b/audio/sfx/noise_instrument18_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_2_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_3.asm b/audio/sfx/noise_instrument18_3.asm new file mode 100644 index 00000000..59a5d069 --- /dev/null +++ b/audio/sfx/noise_instrument18_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_3_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument18_4.asm b/audio/sfx/noise_instrument18_4.asm new file mode 100644 index 00000000..c0c77719 --- /dev/null +++ b/audio/sfx/noise_instrument18_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument18_4_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_1.asm b/audio/sfx/noise_instrument19_1.asm new file mode 100644 index 00000000..2fa183d6 --- /dev/null +++ b/audio/sfx/noise_instrument19_1.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_1_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_2.asm b/audio/sfx/noise_instrument19_2.asm new file mode 100644 index 00000000..49d09fcc --- /dev/null +++ b/audio/sfx/noise_instrument19_2.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_2_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_3.asm b/audio/sfx/noise_instrument19_3.asm new file mode 100644 index 00000000..a90b3e4b --- /dev/null +++ b/audio/sfx/noise_instrument19_3.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_3_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/noise_instrument19_4.asm b/audio/sfx/noise_instrument19_4.asm new file mode 100644 index 00000000..1b37d5a1 --- /dev/null +++ b/audio/sfx/noise_instrument19_4.asm @@ -0,0 +1,3 @@ +SFX_Noise_Instrument19_4_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 8a4c521e..c8dfe725 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ -SFX_Not_Very_Effective_Ch1: - unknownnoise0x20 4, 143, 85 - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 - endchannel +SFX_Not_Very_Effective_Ch8: + noise_note 4, 8, -7, 85 + noise_note 2, 15, 4, 68 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c474e9b3..d478dff6 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: - unknownnoise0x20 2, 161, 18 - endchannel +SFX_Peck_Ch8: + noise_note 2, 10, 1, 18 + sound_ret diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index bfd619fd..6827147c 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch1: - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_1_Ch1 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel +SFX_Poisoned_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_1_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b972ca92..fa1808c3 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_3_Ch1: - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_3_Ch1 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel +SFX_Poisoned_3_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_3_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index eccf0ee5..0df1138f 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,77 +1,77 @@ -SFX_Pokedex_Rating_1_Ch1: - executemusic +SFX_Pokedex_Rating_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - notetype 5, 11, 1 + duty_cycle 2 + note_type 5, 11, 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 - endchannel + note F_, 4 + sound_ret -SFX_Pokedex_Rating_1_Ch2: - executemusic - duty 2 - notetype 5, 12, 2 +SFX_Pokedex_Rating_1_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 - F_ 2 - E_ 1 + note F_, 2 + note E_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + sound_ret -SFX_Pokedex_Rating_1_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Pokedex_Rating_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A# 1 + note A#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 3 - C_ 1 + note C_, 1 rest 3 octave 4 - F_ 2 + note F_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index ec82888e..18dbcda2 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,77 +1,77 @@ -SFX_Pokedex_Rating_3_Ch1: - executemusic +SFX_Pokedex_Rating_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - notetype 5, 11, 1 + duty_cycle 2 + note_type 5, 11, 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 - endchannel + note F_, 4 + sound_ret -SFX_Pokedex_Rating_3_Ch2: - executemusic - duty 2 - notetype 5, 12, 2 +SFX_Pokedex_Rating_3_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 - F_ 2 - E_ 1 + note F_, 2 + note E_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + sound_ret -SFX_Pokedex_Rating_3_Ch3: - executemusic - notetype 5, 1, 0 +SFX_Pokedex_Rating_3_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A# 1 + note A#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 3 - C_ 1 + note C_, 1 rest 3 octave 4 - F_ 2 + note F_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index cf61a6ee..88f33d0b 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,21 +1,21 @@ -SFX_Pokeflute_Ch1: +SFX_Pokeflute_Ch3: vibrato 16, 1, 4 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 5 - E_ 2 - F_ 2 - G_ 4 - A_ 2 - G_ 2 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 octave 6 - C_ 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 octave 5 - G_ 2 - A_ 2 - F_ 2 - G_ 8 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 8 rest 12 - endchannel + sound_ret diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch1_ch2.asm deleted file mode 100644 index 84631bca..00000000 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_08_PokeFlute_Ch1: - tempo 256 - - -SFX_08_PokeFlute_Ch2: - executemusic - notetype 8, 0, 0 - rest 5 - rest 7 - rest 5 - rest 5 - rest 5 - rest 5 - endchannel diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm deleted file mode 100644 index 3c883462..00000000 --- a/audio/sfx/pokeflute_ch3.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_PokeFlute_Ch3: - executemusic - vibrato 16, 1, 4 - notetype 8, 1, 0 - octave 5 - E_ 3 - F_ 3 - G_ 7 - A_ 3 - G_ 3 - octave 6 - C_ 13 - endchannel diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm new file mode 100644 index 00000000..4f0e96a8 --- /dev/null +++ b/audio/sfx/pokeflute_ch5_ch6.asm @@ -0,0 +1,14 @@ +SFX_Pokeflute_Ch5: + tempo 256 + + +SFX_Pokeflute_Ch6: + execute_music + note_type 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + sound_ret diff --git a/audio/sfx/pokeflute_ch7.asm b/audio/sfx/pokeflute_ch7.asm new file mode 100644 index 00000000..4435c0fb --- /dev/null +++ b/audio/sfx/pokeflute_ch7.asm @@ -0,0 +1,13 @@ +SFX_Pokeflute_Ch7: + execute_music + vibrato 16, 1, 4 + note_type 8, 1, 0 + octave 5 + note E_, 3 + note F_, 3 + note G_, 7 + note A_, 3 + note G_, 3 + octave 6 + note C_, 13 + sound_ret diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index f70f6725..d1891751 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: - unknownnoise0x20 2, 161, 34 - endchannel +SFX_Pound_Ch8: + noise_note 2, 10, 1, 34 + sound_ret diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index f68a6384..7767547c 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_1_Ch1: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel +SFX_Press_AB_1_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 83b5ccd6..7e01bce5 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_2_Ch1: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel +SFX_Press_AB_2_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 167c0fb1..4b4c78b9 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_3_Ch1: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel +SFX_Press_AB_3_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 893d4334..2b94cf6d 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch1: - dutycycle 161 - unknownsfx0x20 10, 241, 64, 6 - unknownsfx0x20 10, 243, 128, 6 - unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_Psybeam_Ch1 - unknownsfx0x20 10, 241, 64, 6 - endchannel +SFX_Psybeam_Ch5: + duty_cycle_pattern 2, 2, 0, 1 + square_note 10, 15, 1, 1600 + square_note 10, 15, 3, 1664 + square_note 10, 15, 2, 1568 + sound_loop 4, SFX_Psybeam_Ch5 + square_note 10, 15, 1, 1600 + sound_ret -SFX_Psybeam_Ch2: - dutycycle 179 - unknownsfx0x20 10, 243, 113, 5 - unknownsfx0x20 7, 227, 49, 5 - unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_Psybeam_Ch2 - unknownsfx0x20 10, 241, 113, 5 - endchannel +SFX_Psybeam_Ch6: + duty_cycle_pattern 2, 3, 0, 3 + square_note 10, 15, 3, 1393 + square_note 7, 14, 3, 1329 + square_note 10, 15, 1, 1361 + sound_loop 4, SFX_Psybeam_Ch6 + square_note 10, 15, 1, 1393 + sound_ret -SFX_Psybeam_Ch3: - unknownnoise0x20 2, 209, 74 - unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_Psybeam_Ch3 - endchannel +SFX_Psybeam_Ch8: + noise_note 2, 13, 1, 74 + noise_note 2, 13, 2, 42 + sound_loop 21, SFX_Psybeam_Ch8 + sound_ret diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index abaa8345..ff0ab384 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ -SFX_Psychic_M_Ch1: - duty 2 - unknownsfx0x10 247 - unknownsfx0x20 8, 196, 189, 7 - unknownsfx0x20 8, 196, 190, 7 - unknownsfx0x20 8, 196, 191, 7 - unknownsfx0x20 8, 196, 192, 7 - unknownsfx0x20 15, 196, 193, 7 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x10 8 - endchannel +SFX_Psychic_M_Ch5: + duty_cycle 2 + pitch_sweep 15, 7 + square_note 8, 12, 4, 1981 + square_note 8, 12, 4, 1982 + square_note 8, 12, 4, 1983 + square_note 8, 12, 4, 1984 + square_note 15, 12, 4, 1985 + square_note 15, 15, 2, 1984 + pitch_sweep 0, 8 + sound_ret -SFX_Psychic_M_Ch2: - duty 2 - unknownsfx0x20 8, 196, 112, 7 - unknownsfx0x20 8, 196, 97, 7 - unknownsfx0x20 8, 196, 98, 7 - unknownsfx0x20 8, 196, 99, 7 - unknownsfx0x20 15, 196, 100, 7 - unknownsfx0x20 15, 242, 100, 7 - endchannel +SFX_Psychic_M_Ch6: + duty_cycle 2 + square_note 8, 12, 4, 1904 + square_note 8, 12, 4, 1889 + square_note 8, 12, 4, 1890 + square_note 8, 12, 4, 1891 + square_note 15, 12, 4, 1892 + square_note 15, 15, 2, 1892 + sound_ret -SFX_Psychic_M_Ch3: - unknownnoise0x20 15, 63, 20 - unknownnoise0x20 15, 207, 19 - unknownnoise0x20 15, 207, 18 - unknownnoise0x20 15, 207, 17 - unknownnoise0x20 15, 207, 16 - unknownnoise0x20 15, 194, 16 - endchannel +SFX_Psychic_M_Ch8: + noise_note 15, 3, -7, 20 + noise_note 15, 12, -7, 19 + noise_note 15, 12, -7, 18 + noise_note 15, 12, -7, 17 + noise_note 15, 12, -7, 16 + noise_note 15, 12, 2, 16 + sound_ret diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 767035ea..9dc06f0b 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ -SFX_Purchase_1_Ch1: - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel +SFX_Purchase_1_Ch5: + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret -SFX_Purchase_1_Ch2: - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel +SFX_Purchase_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 65a22527..eaa4bb60 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,13 +1,13 @@ -SFX_Purchase_3_Ch1: - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel +SFX_Purchase_3_Ch5: + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret -SFX_Purchase_3_Ch2: - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel +SFX_Purchase_3_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index cf43bbcf..c2155ca9 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_1_Ch1: - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel +SFX_Push_Boulder_1_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index 9f536964..5f084139 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_3_Ch1: - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel +SFX_Push_Boulder_3_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 656d3d01..b4ed791b 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ -SFX_Run_Ch1: - unknownnoise0x20 2, 97, 35 - unknownnoise0x20 2, 161, 51 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 81, 17 - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 65, 17 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 2, 129, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 8, 65, 51 - endchannel +SFX_Run_Ch8: + noise_note 2, 6, 1, 35 + noise_note 2, 10, 1, 51 + noise_note 2, 12, 1, 51 + noise_note 2, 5, 1, 17 + noise_note 2, 15, 1, 51 + noise_note 2, 4, 1, 17 + noise_note 2, 12, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 2, 8, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 8, 4, 1, 51 + sound_ret diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index d385feb3..6ce7b7c3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ -SFX_Safari_Zone_PA_Ch1: - duty 2 - unknownsfx0x20 15, 243, 48, 7 - unknownsfx0x20 8, 101, 48, 7 - unknownsfx0x20 15, 244, 0, 7 - unknownsfx0x20 15, 116, 0, 7 - unknownsfx0x20 15, 68, 0, 7 - unknownsfx0x20 15, 36, 0, 7 - endchannel +SFX_Safari_Zone_PA_Ch5: + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 13cb46e5..d0849ff5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ -SFX_Save_1_Ch1: - duty 2 - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 2, 228, 0, 6 - unknownsfx0x20 2, 228, 128, 6 - unknownsfx0x20 2, 228, 192, 6 - unknownsfx0x20 2, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel +SFX_Save_1_Ch5: + duty_cycle 2 + square_note 4, 15, 4, 1792 + square_note 2, 14, 4, 1536 + square_note 2, 14, 4, 1664 + square_note 2, 14, 4, 1728 + square_note 2, 14, 4, 1792 + square_note 2, 14, 4, 1952 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Save_1_Ch2: - duty 2 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 2, 212, 1, 7 - unknownsfx0x20 2, 196, 1, 6 - unknownsfx0x20 2, 196, 129, 6 - unknownsfx0x20 2, 196, 193, 6 - unknownsfx0x20 2, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 - unknownsfx0x20 15, 210, 225, 7 - endchannel +SFX_Save_1_Ch6: + duty_cycle 2 + square_note 4, 0, 8, 0 + square_note 2, 13, 4, 1793 + square_note 2, 12, 4, 1537 + square_note 2, 12, 4, 1665 + square_note 2, 12, 4, 1729 + square_note 2, 12, 4, 1793 + square_note 2, 12, 4, 1953 + square_note 15, 13, 2, 2017 + sound_ret diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 7f0df72c..10589ab3 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,18 +1,19 @@ -SFX_Save_3_Ch1: - duty 2 - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 - endchannel +SFX_Save_3_Ch5: + duty_cycle 2 + square_note 3, 14, 4, 1536 + square_note 3, 14, 4, 1664 + square_note 3, 14, 4, 1728 + square_note 3, 14, 4, 1792 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Save_3_Ch2: - duty 2 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 - endchannel + +SFX_Save_3_Ch6: + duty_cycle 2 + square_note 3, 0, 8, 0 + square_note 3, 12, 4, 1537 + square_note 3, 12, 4, 1665 + square_note 3, 12, 4, 1729 + square_note 3, 12, 4, 1793 + square_note 15, 13, 2, 2017 + sound_ret diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 282f83b5..6a06ec5a 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ -SFX_Shooting_Star_Ch1: - dutycycle 136 - unknownsfx0x10 47 - unknownsfx0x20 4, 64, 224, 7 - unknownsfx0x20 4, 96, 224, 7 - unknownsfx0x20 4, 128, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 128, 224, 7 - unknownsfx0x20 8, 96, 224, 7 - unknownsfx0x20 8, 48, 224, 7 - unknownsfx0x20 15, 18, 224, 7 - unknownsfx0x10 8 - endchannel +SFX_Shooting_Star_Ch5: + duty_cycle_pattern 2, 0, 2, 0 + pitch_sweep 2, -7 + square_note 4, 4, 0, 2016 + square_note 4, 6, 0, 2016 + square_note 4, 8, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 8, 0, 2016 + square_note 8, 6, 0, 2016 + square_note 8, 3, 0, 2016 + square_note 15, 1, 2, 2016 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index d69d60de..912dd3f9 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ -SFX_Shrink_1_Ch1: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel +SFX_Shrink_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index e5c4b7af..88da25c2 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ -SFX_Shrink_3_Ch1: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel +SFX_Shrink_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ad789af2..4a565740 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ -SFX_Silph_Scope_Ch1: - duty 0 - unknownsfx0x20 0, 210, 0, 7 - unknownsfx0x20 0, 210, 64, 7 - unknownsfx0x20 0, 210, 128, 7 - unknownsfx0x20 0, 210, 192, 7 - unknownsfx0x20 10, 225, 224, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Silph_Scope_Ch5: + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d29529e9..a8b668b8 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ -SFX_Slots_New_Spin_Ch1: - duty 3 - unknownsfx0x20 5, 225, 0, 7 - unknownsfx0x20 2, 225, 128, 7 - unknownsfx0x20 15, 241, 192, 7 - endchannel +SFX_Slots_New_Spin_Ch5: + duty_cycle 3 + square_note 5, 14, 1, 1792 + square_note 2, 14, 1, 1920 + square_note 15, 15, 1, 1984 + sound_ret -SFX_Slots_New_Spin_Ch2: - duty 2 - unknownsfx0x20 4, 193, 193, 6 - unknownsfx0x20 2, 193, 65, 7 - unknownsfx0x20 15, 209, 129, 7 - endchannel +SFX_Slots_New_Spin_Ch6: + duty_cycle 2 + square_note 4, 12, 1, 1729 + square_note 2, 12, 1, 1857 + square_note 15, 13, 1, 1921 + sound_ret diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index d7833f55..8f2d1829 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ -SFX_Slots_Reward_Ch1: - duty 2 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 8, 129, 224, 7 - endchannel +SFX_Slots_Reward_Ch5: + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 8, 8, 1, 2016 + sound_ret diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 00641a5e..b9a69c19 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ -SFX_Slots_Stop_Wheel_Ch1: - duty 2 - unknownsfx0x20 1, 242, 160, 6 - unknownsfx0x20 1, 242, 224, 6 - unknownsfx0x20 8, 241, 0, 7 - endchannel +SFX_Slots_Stop_Wheel_Ch5: + duty_cycle 2 + square_note 1, 15, 2, 1696 + square_note 1, 15, 2, 1760 + square_note 8, 15, 1, 1792 + sound_ret diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm deleted file mode 100644 index 9f7b4138..00000000 --- a/audio/sfx/snare1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_1_Ch1: - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm deleted file mode 100644 index 55fdf84a..00000000 --- a/audio/sfx/snare1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_2_Ch1: - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm deleted file mode 100644 index cab603c1..00000000 --- a/audio/sfx/snare1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_3_Ch1: - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/snare1_4.asm b/audio/sfx/snare1_4.asm deleted file mode 100755 index edeb78ec..00000000 --- a/audio/sfx/snare1_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare1_4_Ch7: - unknownnoise0x20 0, 193, 51 - endchannel - diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm deleted file mode 100644 index e40facb5..00000000 --- a/audio/sfx/snare2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_1_Ch1: - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm deleted file mode 100644 index 82deb096..00000000 --- a/audio/sfx/snare2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_2_Ch1: - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm deleted file mode 100644 index fb5e1672..00000000 --- a/audio/sfx/snare2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_3_Ch1: - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/snare2_4.asm b/audio/sfx/snare2_4.asm deleted file mode 100755 index 43807c44..00000000 --- a/audio/sfx/snare2_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare2_4_Ch7: - unknownnoise0x20 0, 177, 51 - endchannel - diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm deleted file mode 100644 index c2b20add..00000000 --- a/audio/sfx/snare3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_1_Ch1: - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm deleted file mode 100644 index 16f87fc5..00000000 --- a/audio/sfx/snare3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_2_Ch1: - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm deleted file mode 100644 index 6b9a006f..00000000 --- a/audio/sfx/snare3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_3_Ch1: - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/snare3_4.asm b/audio/sfx/snare3_4.asm deleted file mode 100755 index a0fcb0d7..00000000 --- a/audio/sfx/snare3_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare3_4_Ch7: - unknownnoise0x20 0, 161, 51 - endchannel - diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm deleted file mode 100644 index 2796410c..00000000 --- a/audio/sfx/snare4_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_1_Ch1: - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm deleted file mode 100644 index 920321ab..00000000 --- a/audio/sfx/snare4_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_2_Ch1: - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm deleted file mode 100644 index a47c332c..00000000 --- a/audio/sfx/snare4_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_3_Ch1: - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/snare4_4.asm b/audio/sfx/snare4_4.asm deleted file mode 100644 index c1d5cc21..00000000 --- a/audio/sfx/snare4_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare4_4_Ch7: - unknownnoise0x20 0, 129, 51 - endchannel - diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm deleted file mode 100644 index dd4eab3a..00000000 --- a/audio/sfx/snare5_1.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_1_Ch1: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm deleted file mode 100644 index fad74021..00000000 --- a/audio/sfx/snare5_2.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_2_Ch1: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm deleted file mode 100644 index d0ca1d91..00000000 --- a/audio/sfx/snare5_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_3_Ch1: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/snare5_4.asm b/audio/sfx/snare5_4.asm deleted file mode 100644 index 37fe8b27..00000000 --- a/audio/sfx/snare5_4.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_Snare5_4_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel - diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm deleted file mode 100644 index 74bf01c7..00000000 --- a/audio/sfx/snare6_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_1_Ch1: - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm deleted file mode 100644 index 0a96680e..00000000 --- a/audio/sfx/snare6_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_2_Ch1: - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm deleted file mode 100644 index f3130931..00000000 --- a/audio/sfx/snare6_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_3_Ch1: - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/snare6_4.asm b/audio/sfx/snare6_4.asm deleted file mode 100644 index 1b835f00..00000000 --- a/audio/sfx/snare6_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare6_4_Ch7: - unknownnoise0x20 0, 129, 16 - endchannel - diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm deleted file mode 100644 index ef8f80ab..00000000 --- a/audio/sfx/snare7_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_1_Ch1: - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm deleted file mode 100644 index 5e266b12..00000000 --- a/audio/sfx/snare7_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_2_Ch1: - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm deleted file mode 100644 index 26db3703..00000000 --- a/audio/sfx/snare7_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_3_Ch1: - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/snare7_4.asm b/audio/sfx/snare7_4.asm deleted file mode 100644 index ed03d368..00000000 --- a/audio/sfx/snare7_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare7_4_Ch7: - unknownnoise0x20 0, 130, 35 - endchannel - diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm deleted file mode 100644 index 5f624177..00000000 --- a/audio/sfx/snare8_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_1_Ch1: - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm deleted file mode 100644 index cf5d5654..00000000 --- a/audio/sfx/snare8_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_2_Ch1: - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm deleted file mode 100644 index 7da0e415..00000000 --- a/audio/sfx/snare8_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_3_Ch1: - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/snare8_4.asm b/audio/sfx/snare8_4.asm deleted file mode 100644 index ec0e6665..00000000 --- a/audio/sfx/snare8_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare8_4_Ch7: - unknownnoise0x20 0, 130, 37 - endchannel - diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm deleted file mode 100644 index c511cdaf..00000000 --- a/audio/sfx/snare9_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_1_Ch1: - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm deleted file mode 100644 index db9aecf9..00000000 --- a/audio/sfx/snare9_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_2_Ch1: - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm deleted file mode 100644 index 18df2e46..00000000 --- a/audio/sfx/snare9_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_3_Ch1: - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/snare9_4.asm b/audio/sfx/snare9_4.asm deleted file mode 100644 index 254e9ce6..00000000 --- a/audio/sfx/snare9_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Snare9_4_Ch7: - unknownnoise0x20 0, 130, 38 - endchannel - diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 66c95262..7f5094f4 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_1_Ch1: - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel +SFX_SS_Anne_Horn_1_Ch5: + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret -SFX_SS_Anne_Horn_1_Ch2: - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel +SFX_SS_Anne_Horn_1_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 070f111c..fda8e346 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_3_Ch1: - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel +SFX_SS_Anne_Horn_3_Ch5: + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret -SFX_SS_Anne_Horn_3_Ch2: - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel +SFX_SS_Anne_Horn_3_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index f509326c..c82e97e1 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel +SFX_Start_Menu_1_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 92bb7558..9860346d 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel +SFX_Start_Menu_2_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 74c82cf3..d114af51 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel +SFX_Start_Menu_3_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 70d7014a..c6e25dc9 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: - unknownnoise0x20 4, 241, 52 - unknownnoise0x20 15, 242, 100 - endchannel +SFX_Super_Effective_Ch8: + noise_note 4, 15, 1, 52 + noise_note 15, 15, 2, 100 + sound_ret diff --git a/audio/sfx/surfing_add_points.asm b/audio/sfx/surfing_add_points.asm index ea95edf8..3eeed285 100644 --- a/audio/sfx/surfing_add_points.asm +++ b/audio/sfx/surfing_add_points.asm @@ -1,7 +1,7 @@ -SFX_Surfing_Add_Points_Ch4: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel +SFX_Surfing_Add_Points_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/surfing_crash.asm b/audio/sfx/surfing_crash.asm index 88055c35..e1af7f6a 100644 --- a/audio/sfx/surfing_crash.asm +++ b/audio/sfx/surfing_crash.asm @@ -1,6 +1,5 @@ -SFX_Surfing_Crash_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 4, 230, 33 - endchannel - +SFX_Surfing_Crash_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 4, 14, 6, 33 + sound_ret diff --git a/audio/sfx/surfing_flip.asm b/audio/sfx/surfing_flip.asm index 5a135d02..034a55d2 100644 --- a/audio/sfx/surfing_flip.asm +++ b/audio/sfx/surfing_flip.asm @@ -1,8 +1,8 @@ -SFX_Surfing_Flip_Ch4: - duty 2 - unknownsfx0x20 3, 196, 96, 7 - unknownsfx0x20 0, 164, 64, 7 - unknownsfx0x20 2, 196, 64, 7 - unknownsfx0x20 0, 164, 96, 7 - unknownsfx0x20 15, 193, 96, 7 - endchannel +SFX_Surfing_Flip_Ch5: + duty_cycle 2 + square_note 3, 12, 4, 1888 + square_note 0, 10, 4, 1856 + square_note 2, 12, 4, 1856 + square_note 0, 10, 4, 1888 + square_note 15, 12, 1, 1888 + sound_ret diff --git a/audio/sfx/surfing_jump.asm b/audio/sfx/surfing_jump.asm index 13fffb64..af12d9e9 100644 --- a/audio/sfx/surfing_jump.asm +++ b/audio/sfx/surfing_jump.asm @@ -1,10 +1,9 @@ -SFX_Surfing_Jump_Ch7: - unknownnoise0x20 6, 241, 17 - unknownnoise0x20 7, 242, 34 - unknownnoise0x20 8, 243, 51 - unknownnoise0x20 9, 244, 66 - unknownnoise0x20 10, 245, 51 - unknownnoise0x20 11, 246, 34 - unknownnoise0x20 12, 247, 17 - endchannel - +SFX_Surfing_Jump_Ch8: + noise_note 6, 15, 1, 17 + noise_note 7, 15, 2, 34 + noise_note 8, 15, 3, 51 + noise_note 9, 15, 4, 66 + noise_note 10, 15, 5, 51 + noise_note 11, 15, 6, 34 + noise_note 12, 15, 7, 17 + sound_ret diff --git a/audio/sfx/surfing_land.asm b/audio/sfx/surfing_land.asm index 028ef16a..41ece761 100644 --- a/audio/sfx/surfing_land.asm +++ b/audio/sfx/surfing_land.asm @@ -1,6 +1,5 @@ -SFX_Surfing_Land_Ch7: - unknownnoise0x20 3, 243, 102 - unknownnoise0x20 3, 51, 83 - unknownnoise0x20 7, 245, 81 - endchannel - +SFX_Surfing_Land_Ch8: + noise_note 3, 15, 3, 102 + noise_note 3, 3, 3, 83 + noise_note 7, 15, 5, 81 + sound_ret diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 782dd3fb..98bfff72 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ -SFX_Swap_1_Ch1: - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel +SFX_Swap_1_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_1_Ch2: - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Swap_1_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/swap_2.asm b/audio/sfx/swap_2.asm index 270cf15b..51d0f273 100644 --- a/audio/sfx/swap_2.asm +++ b/audio/sfx/swap_2.asm @@ -1,11 +1,11 @@ -SFX_Swap_2_Ch1: - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel +SFX_Swap_2_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_2_Ch2: - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Swap_2_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 4fc1db1d..8e86ac7c 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,11 +1,11 @@ -SFX_Swap_3_Ch1: - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel +SFX_Swap_3_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_3_Ch2: - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Swap_3_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ac9fb680..145fd35a 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ -SFX_Switch_1_Ch1: - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel +SFX_Switch_1_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 81b68d26..ce6f1f15 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,8 +1,8 @@ -SFX_Switch_3_Ch1: - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel +SFX_Switch_3_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 0522ee16..eddaffa6 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_1_Ch1: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel +SFX_Teleport_Enter1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 6518e416..fc185621 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_3_Ch1: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel +SFX_Teleport_Enter1_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 338c1c30..c7901999 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_1_Ch1: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel +SFX_Teleport_Enter2_1_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index f6cd103c..2c0414f3 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_3_Ch1: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel +SFX_Teleport_Enter2_3_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index f916d539..5e27525e 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_1_Ch1: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Teleport_Exit1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 67739bd1..350da576 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_3_Ch1: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Teleport_Exit1_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 1e1de5a5..a2a36942 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_1_Ch1: - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel +SFX_Teleport_Exit2_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 928e486e..70d809c3 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_3_Ch1: - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel +SFX_Teleport_Exit2_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index e6eff9ac..7d56a081 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ -SFX_Tink_1_Ch1: - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel +SFX_Tink_1_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index fa06cf19..94aa8929 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ -SFX_Tink_2_Ch1: - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel +SFX_Tink_2_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index d786d289..1134fdc4 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ -SFX_Tink_3_Ch1: - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel +SFX_Tink_3_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/tink_4.asm b/audio/sfx/tink_4.asm index 4efa3209..16b7be91 100755 --- a/audio/sfx/tink_4.asm +++ b/audio/sfx/tink_4.asm @@ -1,8 +1,8 @@ -SFX_8028e_4_Ch4: - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel +SFX_Tink_4_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 87993851..f09982eb 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_1_Ch1: - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel +SFX_Trade_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 6b70d5da..a85b717e 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_3_Ch1: - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel +SFX_Trade_Machine_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm deleted file mode 100644 index 94b61fe1..00000000 --- a/audio/sfx/triangle1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_1_Ch1: - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm deleted file mode 100644 index 1c9c1d29..00000000 --- a/audio/sfx/triangle1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_2_Ch1: - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm deleted file mode 100644 index b900da7c..00000000 --- a/audio/sfx/triangle1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_3_Ch1: - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/triangle1_4.asm b/audio/sfx/triangle1_4.asm deleted file mode 100644 index a90e4c48..00000000 --- a/audio/sfx/triangle1_4.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle1_4_Ch7: - unknownnoise0x20 0, 81, 42 - endchannel - diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm deleted file mode 100644 index 0f648237..00000000 --- a/audio/sfx/triangle2_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_1_Ch1: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm deleted file mode 100644 index cbc2a642..00000000 --- a/audio/sfx/triangle2_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_2_Ch1: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm deleted file mode 100644 index 44fc95dd..00000000 --- a/audio/sfx/triangle2_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_3_Ch1: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/triangle2_4.asm b/audio/sfx/triangle2_4.asm deleted file mode 100644 index 58b6d511..00000000 --- a/audio/sfx/triangle2_4.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_Triangle2_4_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel - diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm deleted file mode 100644 index f5622bd7..00000000 --- a/audio/sfx/triangle3_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_1_Ch1: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm deleted file mode 100644 index 8b0b76e5..00000000 --- a/audio/sfx/triangle3_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_2_Ch1: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm deleted file mode 100644 index d40779fb..00000000 --- a/audio/sfx/triangle3_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_3_Ch1: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/triangle3_4.asm b/audio/sfx/triangle3_4.asm deleted file mode 100644 index a2fab704..00000000 --- a/audio/sfx/triangle3_4.asm +++ /dev/null @@ -1,5 +0,0 @@ -SFX_Triangle3_4_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel - diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index ca29a4cc..429727b9 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_1_Ch1: - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_1_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 2ae0787b..b6682ae2 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_3_Ch1: - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_3_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 22433707..98c724b5 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ -SFX_Turn_On_PC_1_Ch1: - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 64, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 192, 7 - unknownsfx0x20 8, 161, 0, 7 - endchannel +SFX_Turn_On_PC_1_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1856 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1984 + square_note 8, 10, 1, 1792 + sound_ret diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index d97dc1c7..e33aefa1 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,14 +1,14 @@ -SFX_Turn_On_PC_3_Ch1: - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 64, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 192, 7 - unknownsfx0x20 3, 129, 0, 7 - endchannel +SFX_Turn_On_PC_3_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 15, 0, 0, 0 + square_note 3, 8, 1, 1920 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1856 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1920 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1984 + square_note 3, 8, 1, 1792 + sound_ret diff --git a/audio/sfx/unknown_80263.asm b/audio/sfx/unknown_80263.asm index 884c1352..e1be6dd5 100755 --- a/audio/sfx/unknown_80263.asm +++ b/audio/sfx/unknown_80263.asm @@ -1,4 +1,4 @@ -SFX_80263_4_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel +SFX_Unknown_80263_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/unknown_8026a.asm b/audio/sfx/unknown_8026a.asm index 9dd6a02b..c9ee20c4 100644 --- a/audio/sfx/unknown_8026a.asm +++ b/audio/sfx/unknown_8026a.asm @@ -1,10 +1,9 @@ -SFX_8026a_4_Ch4: - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel - +SFX_Unknown_8026a_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/unknown_8027f.asm b/audio/sfx/unknown_8027f.asm new file mode 100644 index 00000000..5fbb4618 --- /dev/null +++ b/audio/sfx/unknown_8027f.asm @@ -0,0 +1,7 @@ +SFX_Unknown_8027f_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm index 9e209638..3126cf1e 100755 --- a/audio/sfx/unknown_802cc.asm +++ b/audio/sfx/unknown_802cc.asm @@ -1,5 +1,5 @@ -SFX_802cc_4_Ch4: - duty 2 - unknownsfx0x20 3, 180, 192, 7 - unknownsfx0x20 0, 161, 128, 7 - endchannel +SFX_Unknown_802cc_Ch5: + duty_cycle 2 + square_note 3, 11, 4, 1984 + square_note 0, 10, 1, 1920 + sound_ret diff --git a/audio/sfx/unknown_80337.asm b/audio/sfx/unknown_80337.asm index c21f8794..047dfaf4 100644 --- a/audio/sfx/unknown_80337.asm +++ b/audio/sfx/unknown_80337.asm @@ -1,64 +1,31 @@ -SFX_80337_4_Branch: - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel +SFX_Unknown_80337_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_80352_4_Branch: - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel -SFX_8036c_4_Branch: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel +SFX_Unknown_80337_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_80383_4_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - -SFX_803a0_4_Ch5: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - -SFX_803c1_4_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel +SFX_Unknown_80337_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unknown_80383.asm b/audio/sfx/unknown_80383.asm new file mode 100644 index 00000000..a99c601b --- /dev/null +++ b/audio/sfx/unknown_80383.asm @@ -0,0 +1,35 @@ +SFX_Unknown_80383_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret + + +SFX_Unknown_80383_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret + + +SFX_Unknown_80383_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/unknown_803da.asm b/audio/sfx/unknown_803da.asm index 442bd112..40fba1ca 100644 --- a/audio/sfx/unknown_803da.asm +++ b/audio/sfx/unknown_803da.asm @@ -1,24 +1,25 @@ -SFX_803da_4_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel +SFX_Unknown_803da_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_803f1_4_Ch5: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel -SFX_80404_4_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Unknown_803da_Ch6: + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret + +SFX_Unknown_803da_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_80411.asm b/audio/sfx/unknown_80411.asm index 4ef49cdf..a6ba154b 100644 --- a/audio/sfx/unknown_80411.asm +++ b/audio/sfx/unknown_80411.asm @@ -1,32 +1,33 @@ -SFX_80411_4_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Unknown_80411_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_80434_4_Ch5: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel -SFX_80457_4_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Unknown_80411_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret + +SFX_Unknown_80411_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/unknown_80467.asm b/audio/sfx/unknown_80467.asm index 7e5335ff..07fe1ca8 100644 --- a/audio/sfx/unknown_80467.asm +++ b/audio/sfx/unknown_80467.asm @@ -1,33 +1,34 @@ -SFX_80467_4_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel +SFX_Unknown_80467_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_80486_4_Ch5: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel -SFX_804a9_4_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Unknown_80467_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret + +SFX_Unknown_80467_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_804bf.asm b/audio/sfx/unknown_804bf.asm index 6776692c..a4e5c616 100644 --- a/audio/sfx/unknown_804bf.asm +++ b/audio/sfx/unknown_804bf.asm @@ -1,25 +1,26 @@ -SFX_804bf_4_Ch4: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel +SFX_Unknown_804bf_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_804d6_4_Ch5: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel -SFX_804ed_4_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel +SFX_Unknown_804bf_Ch6: + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret + +SFX_Unknown_804bf_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/unknown_804fa.asm b/audio/sfx/unknown_804fa.asm index 74b7e681..0660ffd5 100644 --- a/audio/sfx/unknown_804fa.asm +++ b/audio/sfx/unknown_804fa.asm @@ -1,29 +1,30 @@ -SFX_804fa_4_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel +SFX_Unknown_804fa_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_80519_4_Ch5: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel -SFX_80538_4_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel +SFX_Unknown_804fa_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret + +SFX_Unknown_804fa_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/unknown_80545.asm b/audio/sfx/unknown_80545.asm index 9ba19478..ab819869 100644 --- a/audio/sfx/unknown_80545.asm +++ b/audio/sfx/unknown_80545.asm @@ -1,28 +1,29 @@ -SFX_80545_4_Ch4: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel +SFX_Unknown_80545_Ch5: + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_80560_4_Ch5: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel -SFX_8057b_4_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel +SFX_Unknown_80545_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret + +SFX_Unknown_80545_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/unknown_8058b.asm b/audio/sfx/unknown_8058b.asm index 9e424200..b3082714 100644 --- a/audio/sfx/unknown_8058b.asm +++ b/audio/sfx/unknown_8058b.asm @@ -1,30 +1,31 @@ -SFX_8058b_4_Ch4: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel +SFX_Unknown_8058b_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_805ae_4_Ch5: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel -SFX_805d1_4_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel +SFX_Unknown_8058b_Ch6: + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret + +SFX_Unknown_8058b_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/unknown_805db.asm b/audio/sfx/unknown_805db.asm index 5e978a1e..7bb82004 100644 --- a/audio/sfx/unknown_805db.asm +++ b/audio/sfx/unknown_805db.asm @@ -1,20 +1,21 @@ -SFX_805db_4_Ch4: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel +SFX_Unknown_805db_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_805ea_4_Ch5: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel -SFX_805f9_4_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel +SFX_Unknown_805db_Ch6: + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret + +SFX_Unknown_805db_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/unknown_80603.asm b/audio/sfx/unknown_80603.asm index 3cbc9ca2..c673990c 100644 --- a/audio/sfx/unknown_80603.asm +++ b/audio/sfx/unknown_80603.asm @@ -1,22 +1,23 @@ -SFX_80603_4_Ch4: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel +SFX_Unknown_80603_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_80616_4_Ch5: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel -SFX_80629_4_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel +SFX_Unknown_80603_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret + +SFX_Unknown_80603_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/unknown_80633.asm b/audio/sfx/unknown_80633.asm index 9be59347..c2b421e1 100644 --- a/audio/sfx/unknown_80633.asm +++ b/audio/sfx/unknown_80633.asm @@ -1,20 +1,22 @@ -SFX_80633_4_Ch4: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 -SFX_8064d_4_Ch5: - endchannel +SFX_Unknown_80633_Ch5: + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_8064e_4_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel +SFX_Unknown_80633_Ch6: + sound_ret + + +SFX_Unknown_80633_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/unknown_80661.asm b/audio/sfx/unknown_80661.asm index f6848664..e45a2b1f 100644 --- a/audio/sfx/unknown_80661.asm +++ b/audio/sfx/unknown_80661.asm @@ -1,20 +1,21 @@ -SFX_80661_4_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Unknown_80661_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_80670_4_Ch5: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel -SFX_8067f_4_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel +SFX_Unknown_80661_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret + +SFX_Unknown_80661_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/unknown_80689.asm b/audio/sfx/unknown_80689.asm index 0e2c573a..50e3d7dc 100644 --- a/audio/sfx/unknown_80689.asm +++ b/audio/sfx/unknown_80689.asm @@ -1,17 +1,19 @@ -SFX_80689_4_Ch4: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel +SFX_Unknown_80689_Ch5: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_8069c_4_Ch5: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 -SFX_806ae_4_Ch7: - endchannel +SFX_Unknown_80689_Ch6: + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 + + +SFX_Unknown_80689_Ch8: + sound_ret diff --git a/audio/sfx/unknown_806af.asm b/audio/sfx/unknown_806af.asm index 3cb97c62..611b655a 100644 --- a/audio/sfx/unknown_806af.asm +++ b/audio/sfx/unknown_806af.asm @@ -1,36 +1,37 @@ -SFX_806af_4_Ch4: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel +SFX_Unknown_806af_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_806da_4_Ch5: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel -SFX_806f9_4_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel +SFX_Unknown_806af_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret + +SFX_Unknown_806af_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/unknown_80712.asm b/audio/sfx/unknown_80712.asm index 689f12ad..48d00508 100644 --- a/audio/sfx/unknown_80712.asm +++ b/audio/sfx/unknown_80712.asm @@ -1,27 +1,29 @@ -SFX_80712_4_Ch4: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel +SFX_Unknown_80712_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_80739_4_Ch5: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 -SFX_8075f_4_Ch7: - endchannel +SFX_Unknown_80712_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 + + +SFX_Unknown_80712_Ch8: + sound_ret diff --git a/audio/sfx/unknown_80760.asm b/audio/sfx/unknown_80760.asm index 47d28da0..4fd9eba2 100644 --- a/audio/sfx/unknown_80760.asm +++ b/audio/sfx/unknown_80760.asm @@ -1,15 +1,17 @@ -SFX_80760_4_Ch4: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - -SFX_8076f_4_Ch5: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 -SFX_8077d_4_Ch7: - endchannel +SFX_Unknown_80760_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret + +SFX_Unknown_80760_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 + + +SFX_Unknown_80760_Ch8: + sound_ret diff --git a/audio/sfx/unknown_8077e.asm b/audio/sfx/unknown_8077e.asm index 2047af78..c0ea51ad 100644 --- a/audio/sfx/unknown_8077e.asm +++ b/audio/sfx/unknown_8077e.asm @@ -1,39 +1,40 @@ -SFX_8077e_4_Ch4: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_8077e_4_Ch4 - endchannel +SFX_Unknown_8077e_Ch5: + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Unknown_8077e_Ch5 + sound_ret -SFX_8079d_4_Ch5: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel -SFX_807cc_4_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel +SFX_Unknown_8077e_Ch6: + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret + +SFX_Unknown_8077e_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/unknown_807eb.asm b/audio/sfx/unknown_807eb.asm index 8554695e..c98628a0 100644 --- a/audio/sfx/unknown_807eb.asm +++ b/audio/sfx/unknown_807eb.asm @@ -1,23 +1,24 @@ -SFX_807eb_4_Ch4: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel +SFX_Unknown_807eb_Ch5: + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_807fe_4_Ch5: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel -SFX_80811_4_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel +SFX_Unknown_807eb_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret + +SFX_Unknown_807eb_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_8081e.asm b/audio/sfx/unknown_8081e.asm index 1581d121..ca5e8aa1 100644 --- a/audio/sfx/unknown_8081e.asm +++ b/audio/sfx/unknown_8081e.asm @@ -1,34 +1,35 @@ -SFX_8081e_4_Ch4: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel +SFX_Unknown_8081e_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_8083d_4_Ch5: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel -SFX_80860_4_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel +SFX_Unknown_8081e_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret + +SFX_Unknown_8081e_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/unknown_80879.asm b/audio/sfx/unknown_80879.asm index 23839d60..bbb4043e 100644 --- a/audio/sfx/unknown_80879.asm +++ b/audio/sfx/unknown_80879.asm @@ -1,22 +1,23 @@ -SFX_80879_4_Ch4: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel +SFX_Unknown_80879_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_8088c_4_Ch5: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel -SFX_8089f_4_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Unknown_80879_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret + +SFX_Unknown_80879_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/unknown_808a9.asm b/audio/sfx/unknown_808a9.asm index efa4a0d6..b27eeada 100644 --- a/audio/sfx/unknown_808a9.asm +++ b/audio/sfx/unknown_808a9.asm @@ -1,31 +1,32 @@ -SFX_808a9_4_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel +SFX_Unknown_808a9_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_808c8_4_Ch5: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel -SFX_808e7_4_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Unknown_808a9_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret + +SFX_Unknown_808a9_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/unknown_808fa.asm b/audio/sfx/unknown_808fa.asm index 4bd5839f..37d49937 100644 --- a/audio/sfx/unknown_808fa.asm +++ b/audio/sfx/unknown_808fa.asm @@ -1,16 +1,18 @@ -SFX_808fa_4_Ch4: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel +SFX_Unknown_808fa_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_80909_4_Ch5: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 -SFX_8091b_4_Ch7: - endchannel +SFX_Unknown_808fa_Ch6: + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 + + +SFX_Unknown_808fa_Ch8: + sound_ret diff --git a/audio/sfx/unknown_8091c.asm b/audio/sfx/unknown_8091c.asm index c4fa4c20..0d160799 100644 --- a/audio/sfx/unknown_8091c.asm +++ b/audio/sfx/unknown_8091c.asm @@ -1,20 +1,21 @@ -SFX_8091c_4_Ch4: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel +SFX_Unknown_8091c_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_8092b_4_Ch5: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel -SFX_8093a_4_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel +SFX_Unknown_8091c_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret + +SFX_Unknown_8091c_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/unknown_80944.asm b/audio/sfx/unknown_80944.asm index e16cec26..adfc42b2 100644 --- a/audio/sfx/unknown_80944.asm +++ b/audio/sfx/unknown_80944.asm @@ -1,25 +1,26 @@ -SFX_80944_4_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel +SFX_Unknown_80944_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_8095b_4_Ch5: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel -SFX_80972_4_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel +SFX_Unknown_80944_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret + +SFX_Unknown_80944_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_8097f.asm b/audio/sfx/unknown_8097f.asm index b178821c..259b6b34 100644 --- a/audio/sfx/unknown_8097f.asm +++ b/audio/sfx/unknown_8097f.asm @@ -1,23 +1,24 @@ -SFX_8097f_4_Ch4: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel +SFX_Unknown_8097f_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_80992_4_Ch5: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel -SFX_809a5_4_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel +SFX_Unknown_8097f_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret + +SFX_Unknown_8097f_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/unknown_809b2.asm b/audio/sfx/unknown_809b2.asm index 095f7134..08946ec9 100644 --- a/audio/sfx/unknown_809b2.asm +++ b/audio/sfx/unknown_809b2.asm @@ -1,29 +1,30 @@ -SFX_809b2_4_Ch4: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel +SFX_Unknown_809b2_Ch5: + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_809cd_4_Ch5: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel -SFX_809e8_4_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel +SFX_Unknown_809b2_Ch6: + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret + +SFX_Unknown_809b2_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/unknown_809fb.asm b/audio/sfx/unknown_809fb.asm index 7424d61b..68edf2c9 100644 --- a/audio/sfx/unknown_809fb.asm +++ b/audio/sfx/unknown_809fb.asm @@ -1,20 +1,21 @@ -SFX_809fb_4_Ch4: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel +SFX_Unknown_809fb_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_80a0a_4_Ch5: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel -SFX_80a19_4_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Unknown_809fb_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret + +SFX_Unknown_809fb_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_80a23.asm b/audio/sfx/unknown_80a23.asm index c20a37d4..447ad7f3 100644 --- a/audio/sfx/unknown_80a23.asm +++ b/audio/sfx/unknown_80a23.asm @@ -1,37 +1,38 @@ -SFX_80a23_4_Ch4: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel +SFX_Unknown_80a23_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_80a46_4_Ch5: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel -SFX_80a6d_4_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel +SFX_Unknown_80a23_Ch6: + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret + +SFX_Unknown_80a23_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/unknown_80a89.asm b/audio/sfx/unknown_80a89.asm index b79cf7c3..21a1d998 100644 --- a/audio/sfx/unknown_80a89.asm +++ b/audio/sfx/unknown_80a89.asm @@ -1,29 +1,30 @@ -SFX_80a89_4_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel +SFX_Unknown_80a89_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_80aa4_4_Ch5: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel -SFX_80abf_4_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel +SFX_Unknown_80a89_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret + +SFX_Unknown_80a89_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/unknown_80ad2.asm b/audio/sfx/unknown_80ad2.asm index db7b45b2..ab114678 100644 --- a/audio/sfx/unknown_80ad2.asm +++ b/audio/sfx/unknown_80ad2.asm @@ -1,23 +1,24 @@ -SFX_80ad2_4_Ch4: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel +SFX_Unknown_80ad2_Ch5: + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_80ae5_4_Ch5: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel -SFX_80af8_4_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel +SFX_Unknown_80ad2_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret + +SFX_Unknown_80ad2_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/unknown_80b05.asm b/audio/sfx/unknown_80b05.asm index 68ca90f5..e92fb103 100644 --- a/audio/sfx/unknown_80b05.asm +++ b/audio/sfx/unknown_80b05.asm @@ -1,30 +1,31 @@ -SFX_80b05_4_Ch4: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel +SFX_Unknown_80b05_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_80b28_4_Ch5: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel -SFX_80b43_4_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel +SFX_Unknown_80b05_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret + +SFX_Unknown_80b05_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/unknown_80b53.asm b/audio/sfx/unknown_80b53.asm index 3033d299..7645d225 100644 --- a/audio/sfx/unknown_80b53.asm +++ b/audio/sfx/unknown_80b53.asm @@ -1,29 +1,30 @@ -SFX_80b53_4_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel +SFX_Unknown_80b53_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_80b6e_4_Ch5: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel -SFX_80b89_4_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel +SFX_Unknown_80b53_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret + +SFX_Unknown_80b53_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_80b9c.asm b/audio/sfx/unknown_80b9c.asm index 5e54107e..9e6bf047 100644 --- a/audio/sfx/unknown_80b9c.asm +++ b/audio/sfx/unknown_80b9c.asm @@ -1,28 +1,29 @@ -SFX_80b9c_4_Ch4: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel +SFX_Unknown_80b9c_Ch5: + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_80bb7_4_Ch5: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel -SFX_80bd2_4_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel +SFX_Unknown_80b9c_Ch6: + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret + +SFX_Unknown_80b9c_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/unknown_80be2.asm b/audio/sfx/unknown_80be2.asm index 4660d8f2..2efda306 100644 --- a/audio/sfx/unknown_80be2.asm +++ b/audio/sfx/unknown_80be2.asm @@ -1,33 +1,34 @@ -SFX_80be2_4_Ch4: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel +SFX_Unknown_80be2_Ch5: + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_80c05_4_Ch5: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel -SFX_80c28_4_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel +SFX_Unknown_80be2_Ch6: + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret + +SFX_Unknown_80be2_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/unknown_80c3b.asm b/audio/sfx/unknown_80c3b.asm index f6106ebf..9eadefb9 100644 --- a/audio/sfx/unknown_80c3b.asm +++ b/audio/sfx/unknown_80c3b.asm @@ -1,23 +1,24 @@ -SFX_80c3b_4_Ch4: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel +SFX_Unknown_80c3b_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_80c4e_4_Ch5: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel -SFX_80c61_4_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel +SFX_Unknown_80c3b_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret + +SFX_Unknown_80c3b_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/unknown_80c6e.asm b/audio/sfx/unknown_80c6e.asm index 54c4b3f9..360ad173 100644 --- a/audio/sfx/unknown_80c6e.asm +++ b/audio/sfx/unknown_80c6e.asm @@ -1,23 +1,24 @@ -SFX_80c6e_4_Ch4: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel +SFX_Unknown_80c6e_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_80c81_4_Ch5: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel -SFX_80c94_4_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel +SFX_Unknown_80c6e_Ch6: + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret + +SFX_Unknown_80c6e_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/unknown_80ca1.asm b/audio/sfx/unknown_80ca1.asm index df3b29be..d42abd93 100644 --- a/audio/sfx/unknown_80ca1.asm +++ b/audio/sfx/unknown_80ca1.asm @@ -1,25 +1,27 @@ -SFX_80ca1_4_Ch4: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel +SFX_Unknown_80ca1_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_80cc4_4_Ch5: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 -SFX_80ce6_4_Ch7: - endchannel +SFX_Unknown_80ca1_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 + + +SFX_Unknown_80ca1_Ch8: + sound_ret diff --git a/audio/sfx/unknown_80ce7.asm b/audio/sfx/unknown_80ce7.asm index 6b5a2163..9c7706c2 100644 --- a/audio/sfx/unknown_80ce7.asm +++ b/audio/sfx/unknown_80ce7.asm @@ -1,24 +1,24 @@ -SFX_80ce7_4_Ch4: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel +SFX_Unknown_80ce7_Ch5: + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_80cfa_4_Ch5: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel -SFX_80d0d_4_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel +SFX_Unknown_80ce7_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret +SFX_Unknown_80ce7_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/unknown_80e5a.asm b/audio/sfx/unknown_80e5a.asm deleted file mode 100644 index 76cf48d4..00000000 --- a/audio/sfx/unknown_80e5a.asm +++ /dev/null @@ -1,46 +0,0 @@ -SFX_80e5a_4_Ch4: - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - -SFX_80e71_4_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - -SFX_80e81_4_Ch6: - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel - diff --git a/audio/sfx/unknown_80e91.asm b/audio/sfx/unknown_80e91.asm index 2b180d9d..8db0a395 100644 --- a/audio/sfx/unknown_80e91.asm +++ b/audio/sfx/unknown_80e91.asm @@ -1,46 +1,47 @@ -SFX_80e91_4_Ch4: - executemusic +SFX_Unknown_80e91_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_80ea8_4_Ch5: - executemusic + +SFX_Unknown_80e91_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret + -SFX_80eb8_4_Ch6: - executemusic - notetype 4, 1, 0 +SFX_Unknown_80e91_Ch8: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel - + sound_ret diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 7e0350d4..aa93f91c 100644 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,56 +1,56 @@ -SFX_08_unused2_Ch1: - executemusic +SFX_Unused2_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 6, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 1 octave 3 - G# 2 - G# 2 - notetype 6, 11, 3 - G# 2 - B_ 2 + note G#, 2 + note G#, 2 + note_type 6, 11, 3 + note G#, 2 + note B_, 2 octave 4 - E_ 8 - endchannel + note E_, 8 + sound_ret -SFX_08_unused2_Ch2: - executemusic +SFX_Unused2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 6, 12, 1 + duty_cycle 2 + note_type 6, 12, 1 octave 4 - E_ 2 - E_ 1 - E_ 1 - notetype 6, 12, 3 - E_ 2 - G# 2 - B_ 8 - endchannel + note E_, 2 + note E_, 1 + note E_, 1 + note_type 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + sound_ret -SFX_08_unused2_Ch3: - executemusic - notetype 6, 1, 0 +SFX_Unused2_Ch7: + execute_music + note_type 6, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - notetype 3, 1, 0 - B_ 1 + note_type 3, 1, 0 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 6, 1, 0 - B_ 1 + note_type 6, 1, 0 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - B_ 4 + note B_, 4 rest 4 - endchannel + sound_ret diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index d0bbfd59..b7a8b4a0 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ -SFX_02_unused_Ch1: - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel +SFX_Unused_1_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_02_unused_Ch2: - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel +SFX_Unused_1_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_02_unused_Ch3: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel +SFX_Unused_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index fd491b71..7a050ea4 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ -SFX_08_unused_Ch1: - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel +SFX_Unused_2_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_08_unused_Ch2: - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel +SFX_Unused_2_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_08_unused_Ch3: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel +SFX_Unused_2_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index b00e55f5..a204fc10 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ -SFX_1f_unused_Ch1: - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel +SFX_Unused_3_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_1f_unused_Ch2: - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel +SFX_Unused_3_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_1f_unused_Ch3: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel +SFX_Unused_3_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index a8445131..c53a7d0a 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ -SFX_Vine_Whip_Ch1: - unknownnoise0x20 1, 194, 51 - unknownnoise0x20 2, 242, 33 - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 1, 194, 50 - unknownnoise0x20 1, 146, 18 - unknownnoise0x20 1, 178, 49 - unknownnoise0x20 12, 145, 16 - unknownnoise0x20 8, 242, 65 - endchannel +SFX_Vine_Whip_Ch8: + noise_note 1, 12, 2, 51 + noise_note 2, 15, 2, 33 + noise_note 1, 14, 2, 51 + noise_note 1, 12, 2, 50 + noise_note 1, 9, 2, 18 + noise_note 1, 11, 2, 49 + noise_note 12, 9, 1, 16 + noise_note 8, 15, 2, 65 + sound_ret diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 59827ceb..c7ab2447 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_1_Ch1: - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Withdraw_Deposit_1_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 0add48e1..568f3230 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_3_Ch1: - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel +SFX_Withdraw_Deposit_3_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 8 + sound_ret |