diff --git a/src/audio/music1.asm b/src/audio/music1.asm index b76d584c..99dc82ef 100644 --- a/src/audio/music1.asm +++ b/src/audio/music1.asm @@ -122,7 +122,7 @@ Music1_Init: ld [wMusicPanning], a xor a ld [wdd8c], a - ld [wde53], a + ld [wSFXIsPlaying], a ld [wMusicWaveChange], a ld [wddef], a ld [wddf0], a @@ -1382,7 +1382,7 @@ Music1_f4866: ld d, a xor $ff ld e, a - ld a, [hld] + ld a, [hld] ; wdd85 and d ld d, a ld a, [hl] diff --git a/src/audio/music2.asm b/src/audio/music2.asm index e3c7e5a8..e786d315 100644 --- a/src/audio/music2.asm +++ b/src/audio/music2.asm @@ -122,7 +122,7 @@ Music2_Init: ld [wMusicPanning], a xor a ld [wdd8c], a - ld [wde53], a + ld [wSFXIsPlaying], a ld [wMusicWaveChange], a ld [wddef], a ld [wddf0], a @@ -1382,7 +1382,7 @@ Music2_f4866: ld d, a xor $ff ld e, a - ld a, [hld] + ld a, [hld] ; wdd85 and d ld d, a ld a, [hl] diff --git a/src/audio/sfx.asm b/src/audio/sfx.asm index 14369e11..00980897 100644 --- a/src/audio/sfx.asm +++ b/src/audio/sfx.asm @@ -11,13 +11,13 @@ SFX_Play: add a ld c, a ld b, $0 - ld a, [wde53] + ld a, [wSFXIsPlaying] or a - jr z, .asm_fc019 + jr z, .no_sfx_playing call Func_fc279 -.asm_fc019 - ld a, $1 - ld [wde53], a +.no_sfx_playing + ld a, TRUE + ld [wSFXIsPlaying], a ld hl, SFXHeaderPointers add hl, bc ld a, [hli] @@ -26,13 +26,13 @@ SFX_Play: ld a, [hli] ld [wdd8c], a ld [wde54], a - ld de, wde4b + ld de, wSFXCommandPointers ld c, $0 -.asm_fc031 +.loop_cmd_ptrs ld a, [wde54] rrca ld [wde54], a - jr nc, .asm_fc050 + jr nc, .skip_cmd_ptr ld a, [hli] ld [de], a inc de @@ -40,22 +40,22 @@ SFX_Play: ld [de], a inc de push hl - ld hl, wde2f + ld hl, wSFXPitchOffsets add hl, bc ld [hl], $0 ld hl, wde33 add hl, bc ld [hl], $1 pop hl - jr .asm_fc052 -.asm_fc050 + jr .next_cmd_ptr +.skip_cmd_ptr inc de inc de -.asm_fc052 +.next_cmd_ptr inc c ld a, $4 cp c - jr nz, .asm_fc031 + jr nz, .loop_cmd_ptrs .invalidID ret @@ -83,16 +83,16 @@ SFX_Update: dec a jr z, .asm_fc082 ld [hl], a - call Func_fc18d + call SFX_ApplyPitchOffset jr .asm_fc08d .asm_fc082 - ld hl, wde4b + ld hl, wSFXCommandPointers add hl, bc add hl, bc ld a, [hli] ld h, [hl] ld l, a - call Func_fc094 + call ExecuteNextSFXCommand .asm_fc08d inc c ld a, c @@ -100,7 +100,7 @@ SFX_Update: jr nz, .asm_fc06c ret -Func_fc094: +ExecuteNextSFXCommand: ld a, [hl] and $f0 swap a @@ -120,15 +120,15 @@ Func_fc094: jp hl SFX_CommandTable: - dw SFX_0 - dw SFX_1 - dw SFX_2 + dw SFX_frequency + dw SFX_envelope + dw SFX_duty dw SFX_loop dw SFX_endloop - dw SFX_5 - dw SFX_6 - dw SFX_7 - dw SFX_8 + dw SFX_pitch_offset + dw SFX_wait + dw SFX_wave + dw SFX_pan dw SFX_unused dw SFX_unused dw SFX_unused @@ -138,12 +138,12 @@ SFX_CommandTable: dw SFX_end SFX_unused: - jp Func_fc094 + jp ExecuteNextSFXCommand -SFX_0: - ld d, a +SFX_frequency: + ld d, a ; high pop hl - ld a, [hli] + ld a, [hli] ; low ld e, a push hl ld hl, wde37 @@ -156,13 +156,13 @@ SFX_0: ld [hl], d ld a, c cp $3 - jr nz, .asm_fc0e9 + jr nz, .not_noise_channel ld a, b xor e and $8 swap a ld d, a -.asm_fc0e9 +.not_noise_channel pop bc ld hl, wde2b add hl, bc @@ -186,7 +186,7 @@ SFX_0: ld [hl], d pop de Func_fc105: - ld hl, wde4b + ld hl, wSFXCommandPointers add hl, bc add hl, bc ld [hl], e @@ -194,7 +194,7 @@ Func_fc105: ld [hl], d ret -SFX_1: +SFX_envelope: ld hl, wde2b add hl, bc ld a, $80 @@ -212,9 +212,9 @@ SFX_1: ld l, a ld [hl], e pop hl - jp Func_fc094 + jp ExecuteNextSFXCommand -SFX_2: +SFX_duty: swap a ld e, a ld hl, rNR11 @@ -226,7 +226,7 @@ SFX_2: ld l, a ld [hl], e pop hl - jp Func_fc094 + jp ExecuteNextSFXCommand SFX_loop: ld hl, wde43 @@ -243,7 +243,7 @@ SFX_loop: ld [hl], a ld l, e ld h, d - jp Func_fc094 + jp ExecuteNextSFXCommand SFX_endloop: ld hl, wde3f @@ -259,30 +259,30 @@ SFX_endloop: ld h, [hl] ld l, a pop de - jp Func_fc094 + jp ExecuteNextSFXCommand .asm_fc162 pop hl - jp Func_fc094 + jp ExecuteNextSFXCommand -SFX_5: - ld hl, wde2f +SFX_pitch_offset: + ld hl, wSFXPitchOffsets add hl, bc ld e, l ld d, h pop hl ld a, [hli] ld [de], a - jp Func_fc094 + jp ExecuteNextSFXCommand -SFX_6: +SFX_wait: ld a, c cp $3 - jr nz, .asm_fc17c + jr nz, .not_noise_channel call Func_fc1cd - jr .asm_fc17f -.asm_fc17c - call Func_fc18d -.asm_fc17f + jr .applied_pitch_offset +.not_noise_channel + call SFX_ApplyPitchOffset +.applied_pitch_offset ld hl, wde33 add hl, bc ld e, l @@ -294,18 +294,19 @@ SFX_6: ld d, h jp Func_fc105 -Func_fc18d: - ld hl, wde2f +SFX_ApplyPitchOffset: + ld hl, wSFXPitchOffsets add hl, bc ld a, [hl] or a - jr z, .asm_fc1cc + jr z, .no_pitch_offset ld hl, wde37 add hl, bc add hl, bc bit 7, a - jr z, .asm_fc1aa - xor $ff + jr z, .positive +; negative + xor $ff ; cpl inc a ld d, a ld a, [hl] @@ -313,9 +314,9 @@ Func_fc18d: ld [hli], a ld e, a ld a, [hl] - sbc b - jr .asm_fc1b1 -.asm_fc1aa + sbc b ; b is 0 + jr .got_result +.positive ld d, a ld a, [hl] add d @@ -323,7 +324,7 @@ Func_fc18d: ld e, a ld a, [hl] adc b -.asm_fc1b1 +.got_result ld [hl], a ld hl, wde2b add hl, bc @@ -345,18 +346,18 @@ Func_fc18d: ld a, e ld [hli], a ld [hl], d -.asm_fc1cc +.no_pitch_offset ret Func_fc1cd: ld hl, wde32 ld a, [hl] or a - jr z, .asm_fc201 + jr z, .no_pitch_offset ld hl, wde3d bit 7, a - jr z, .asm_fc1e5 - xor $ff + jr z, .positive + xor $ff ; cpl inc a ld d, a ld e, [hl] @@ -364,7 +365,7 @@ Func_fc1cd: sub d ld [hl], a jr .asm_fc1ea -.asm_fc1e5 +.positive ld d, a ld e, [hl] ld a, e @@ -387,10 +388,10 @@ Func_fc1cd: ld a, d ld [hli], a ld [hl], e -.asm_fc201 +.no_pitch_offset ret -SFX_7: +SFX_wave: add a ld d, $0 ld e, a @@ -417,22 +418,22 @@ SFX_7: ldh [rNR30], a ld b, $0 pop hl - jp Func_fc094 + jp ExecuteNextSFXCommand -SFX_8: +SFX_pan: pop hl ld a, [hli] push hl push bc inc c - ld e, $ee -.asm_fc234 + ld e, %11101110 +.loop_rotate_masks dec c - jr z, .asm_fc23c + jr z, .got_masks rlca rlc e - jr .asm_fc234 -.asm_fc23c + jr .loop_rotate_masks +.got_masks ld d, a ld hl, wdd85 ld a, [hl] @@ -441,7 +442,7 @@ SFX_8: ld [hl], a pop bc pop hl - jp Func_fc094 + jp ExecuteNextSFXCommand SFX_end: ld e, c @@ -460,7 +461,7 @@ SFX_end: rlca add c ld e, a - ld d, b + ld d, b ; 0 ld hl, rNR12 add hl, de ld a, $8 @@ -473,7 +474,7 @@ SFX_end: Func_fc26c: xor a - ld [wde53], a + ld [wSFXIsPlaying], a ld [wSfxPriority], a ld a, $80 ld [wCurSfxID], a diff --git a/src/audio/sfx/sfx_barrier.asm b/src/audio/sfx/sfx_barrier.asm index 2cc712fb..de44bfee 100644 --- a/src/audio/sfx/sfx_barrier.asm +++ b/src/audio/sfx/sfx_barrier.asm @@ -1,68 +1,68 @@ Sfx_Barrier_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 123 - sfx_0 7, 107 - sfx_0 7, 123 - sfx_0 7, 131 - sfx_0 7, 123 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 985.50 + sfx_freq 879.68 + sfx_freq 985.50 + sfx_freq 1048.58 + sfx_freq 985.50 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 sfx_end diff --git a/src/audio/sfx/sfx_beam.asm b/src/audio/sfx/sfx_beam.asm index 5bc01087..239b96a0 100644 --- a/src/audio/sfx/sfx_beam.asm +++ b/src/audio/sfx/sfx_beam.asm @@ -1,29 +1,29 @@ Sfx_Beam_Ch1: - sfx_1 84 - sfx_8 17 - sfx_2 0 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_1 212 - sfx_8 17 - sfx_2 0 + sfx_env 5, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_env 13, 4 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 10 - sfx_0 7, 131 - sfx_0 7, 138 + sfx_freq 1048.58 + sfx_freq 1110.78 sfx_endloop - sfx_1 228 - sfx_8 17 - sfx_2 4 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 sfx_loop 10 - sfx_0 7, 138 - sfx_0 7, 157 + sfx_freq 1110.78 + sfx_freq 1323.96 sfx_endloop - sfx_1 100 - sfx_8 17 - sfx_2 4 - sfx_0 7, 157 - sfx_1 52 - sfx_8 17 - sfx_2 4 - sfx_0 7, 157 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1323.96 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1323.96 sfx_end diff --git a/src/audio/sfx/sfx_bench_whirlwind.asm b/src/audio/sfx/sfx_bench_whirlwind.asm index 3502571e..1952ce8a 100644 --- a/src/audio/sfx/sfx_bench_whirlwind.asm +++ b/src/audio/sfx/sfx_bench_whirlwind.asm @@ -1,335 +1,335 @@ Sfx_BenchWhirlwind_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 239 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 239 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 223 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 223 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 95 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 95 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 95 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 162 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 182 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 190 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 209 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 209 - sfx_0 7, 223 - sfx_0 7, 209 - sfx_0 7, 223 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 13, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 13, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 5, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 5, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 5, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1394.38 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1771.24 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1985.94 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2788.77 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2788.77 + sfx_freq 3971.88 + sfx_freq 2788.77 + sfx_freq 3971.88 sfx_end diff --git a/src/audio/sfx/sfx_big_flame.asm b/src/audio/sfx/sfx_big_flame.asm index 02d8fade..12a6efe7 100644 --- a/src/audio/sfx/sfx_big_flame.asm +++ b/src/audio/sfx/sfx_big_flame.asm @@ -1,100 +1,100 @@ Sfx_BigFlame_Ch1: - sfx_8 17 - sfx_1 111 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_1 246 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_1 134 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_1 102 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_1 70 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_1 38 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_1 22 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_env 15, 6 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_env 8, 6 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_env 6, 6 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_env 4, 6 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_env 2, 6 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_env 1, 6 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 sfx_end diff --git a/src/audio/sfx/sfx_big_hit.asm b/src/audio/sfx/sfx_big_hit.asm index 82577e6a..bee47ac9 100644 --- a/src/audio/sfx/sfx_big_hit.asm +++ b/src/audio/sfx/sfx_big_hit.asm @@ -1,66 +1,66 @@ Sfx_BigHit_Ch1: - sfx_8 17 - sfx_1 241 - sfx_0 0, 45 - sfx_0 0, 77 - sfx_0 0, 45 - sfx_0 0, 77 - sfx_0 0, 45 - sfx_0 0, 77 - sfx_1 209 - sfx_0 0, 69 - sfx_0 0, 20 - sfx_0 0, 67 - sfx_0 0, 51 - sfx_0 0, 50 - sfx_0 0, 51 - sfx_1 193 - sfx_0 0, 50 - sfx_0 0, 51 - sfx_0 0, 50 - sfx_0 0, 51 - sfx_0 0, 50 - sfx_0 0, 49 - sfx_1 145 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_1 129 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 64 - sfx_0 0, 65 - sfx_0 0, 64 - sfx_0 0, 65 - sfx_1 113 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_1 97 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_1 65 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 80 - sfx_1 33 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_1 17 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_freq 65.44 + sfx_freq 66.50 + sfx_freq 65.44 + sfx_freq 66.50 + sfx_freq 65.44 + sfx_freq 66.50 + sfx_env 13, 1 + sfx_freq 66.23 + sfx_freq 64.63 + sfx_freq 66.16 + sfx_freq 65.63 + sfx_freq 65.60 + sfx_freq 65.63 + sfx_env 12, 1 + sfx_freq 65.60 + sfx_freq 65.63 + sfx_freq 65.60 + sfx_freq 65.63 + sfx_freq 65.60 + sfx_freq 65.57 + sfx_env 9, 1 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_env 8, 1 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.06 + sfx_freq 66.10 + sfx_freq 66.06 + sfx_freq 66.10 + sfx_env 7, 1 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_env 6, 1 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_env 4, 1 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.60 + sfx_env 2, 1 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_env 1, 1 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 sfx_end diff --git a/src/audio/sfx/sfx_big_lightning.asm b/src/audio/sfx/sfx_big_lightning.asm index dff43cee..559b0aca 100644 --- a/src/audio/sfx/sfx_big_lightning.asm +++ b/src/audio/sfx/sfx_big_lightning.asm @@ -1,84 +1,84 @@ Sfx_BigLightning_Ch1: - sfx_8 17 - sfx_1 240 - sfx_0 0, 80 - sfx_0 0, 98 - sfx_0 0, 80 - sfx_0 0, 98 - sfx_0 0, 80 - sfx_0 0, 98 - sfx_0 0, 80 - sfx_0 0, 98 - sfx_0 0, 80 - sfx_0 0, 98 - sfx_0 0, 80 - sfx_0 0, 98 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_1 208 - sfx_0 0, 80 - sfx_0 0, 80 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_1 160 - sfx_0 0, 80 - sfx_0 0, 80 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 112 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 + sfx_pan %00010001 + sfx_env 15, 0 + sfx_freq 66.60 + sfx_freq 67.22 + sfx_freq 66.60 + sfx_freq 67.22 + sfx_freq 66.60 + sfx_freq 67.22 + sfx_freq 66.60 + sfx_freq 67.22 + sfx_freq 66.60 + sfx_freq 67.22 + sfx_freq 66.60 + sfx_freq 67.22 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_env 13, 0 + sfx_freq 66.60 + sfx_freq 66.60 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_env 10, 0 + sfx_freq 66.60 + sfx_freq 66.60 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 7, 0 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 sfx_loop 5 - sfx_1 128 - sfx_0 0, 98 - sfx_0 0, 20 - sfx_0 0, 21 - sfx_0 0, 22 + sfx_env 8, 0 + sfx_freq 67.22 + sfx_freq 64.63 + sfx_freq 64.66 + sfx_freq 64.69 sfx_endloop - sfx_0 0, 20 - sfx_0 0, 21 - sfx_0 0, 22 - sfx_0 0, 20 - sfx_1 128 - sfx_0 0, 21 - sfx_0 0, 22 - sfx_0 0, 20 - sfx_0 0, 19 - sfx_0 0, 18 - sfx_0 0, 20 - sfx_0 0, 19 - sfx_0 0, 18 - sfx_1 64 - sfx_0 0, 21 - sfx_0 0, 23 - sfx_0 0, 21 - sfx_0 0, 23 - sfx_0 0, 21 - sfx_0 0, 65 - sfx_0 0, 67 - sfx_0 0, 65 - sfx_1 32 - sfx_0 0, 68 - sfx_0 0, 84 - sfx_0 0, 68 - sfx_0 0, 84 - sfx_0 0, 69 - sfx_0 0, 85 - sfx_0 0, 69 - sfx_1 22 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 103 - sfx_0 0, 87 - sfx_0 0, 103 - sfx_0 0, 87 - sfx_0 0, 103 + sfx_freq 64.63 + sfx_freq 64.66 + sfx_freq 64.69 + sfx_freq 64.63 + sfx_env 8, 0 + sfx_freq 64.66 + sfx_freq 64.69 + sfx_freq 64.63 + sfx_freq 64.60 + sfx_freq 64.57 + sfx_freq 64.63 + sfx_freq 64.60 + sfx_freq 64.57 + sfx_env 4, 0 + sfx_freq 64.66 + sfx_freq 64.73 + sfx_freq 64.66 + sfx_freq 64.73 + sfx_freq 64.66 + sfx_freq 66.10 + sfx_freq 66.16 + sfx_freq 66.10 + sfx_env 2, 0 + sfx_freq 66.20 + sfx_freq 66.74 + sfx_freq 66.20 + sfx_freq 66.74 + sfx_freq 66.23 + sfx_freq 66.77 + sfx_freq 66.23 + sfx_env 1, 6 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 67.39 + sfx_freq 66.84 + sfx_freq 67.39 + sfx_freq 66.84 + sfx_freq 67.39 sfx_end diff --git a/src/audio/sfx/sfx_big_selfdestruct.asm b/src/audio/sfx/sfx_big_selfdestruct.asm index 88cea792..985d542d 100644 --- a/src/audio/sfx/sfx_big_selfdestruct.asm +++ b/src/audio/sfx/sfx_big_selfdestruct.asm @@ -1,61 +1,61 @@ Sfx_BigSelfdestruct_Ch1: - sfx_8 17 - sfx_1 207 - sfx_0 0, 116 - sfx_0 0, 116 - sfx_0 0, 116 - sfx_0 0, 116 - sfx_1 255 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 82 - sfx_0 0, 82 - sfx_0 0, 82 - sfx_0 0, 82 - sfx_0 0, 82 - sfx_0 0, 82 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 83 - sfx_0 0, 83 - sfx_0 0, 83 - sfx_0 0, 83 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_1 207 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_1 143 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_1 79 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_0 0, 85 - sfx_1 31 - sfx_0 0, 85 - sfx_0 0, 85 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_freq 67.84 + sfx_freq 67.84 + sfx_freq 67.84 + sfx_freq 67.84 + sfx_env 15, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.67 + sfx_freq 66.67 + sfx_freq 66.67 + sfx_freq 66.67 + sfx_freq 66.67 + sfx_freq 66.67 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.70 + sfx_freq 66.70 + sfx_freq 66.70 + sfx_freq 66.70 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_env 12, -7 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_env 8, -7 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_env 4, -7 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_freq 66.77 + sfx_env 1, -7 + sfx_freq 66.77 + sfx_freq 66.77 sfx_end diff --git a/src/audio/sfx/sfx_blizzard.asm b/src/audio/sfx/sfx_blizzard.asm index 2b65f792..42c8ed48 100644 --- a/src/audio/sfx/sfx_blizzard.asm +++ b/src/audio/sfx/sfx_blizzard.asm @@ -1,47 +1,47 @@ Sfx_Blizzard_Ch1: - sfx_8 17 - sfx_1 111 + sfx_pan %00010001 + sfx_env 6, -7 sfx_loop 80 - sfx_0 0, 112 + sfx_freq 67.70 sfx_endloop - sfx_1 143 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 127 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 111 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 95 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 79 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 63 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 47 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_1 31 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 - sfx_0 0, 112 + sfx_env 8, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 7, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 6, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 5, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 4, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 3, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 2, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_env 1, -7 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 + sfx_freq 67.70 sfx_end diff --git a/src/audio/sfx/sfx_bonemerang.asm b/src/audio/sfx/sfx_bonemerang.asm index a5e2e028..a90e19ee 100644 --- a/src/audio/sfx/sfx_bonemerang.asm +++ b/src/audio/sfx/sfx_bonemerang.asm @@ -1,276 +1,276 @@ Sfx_Bonemerang_Ch1: - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 111 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_1 111 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 95 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 5, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 sfx_end Sfx_Bonemerang_Ch2: - sfx_8 17 - sfx_1 223 - sfx_1 0 - sfx_5 0 - sfx_6 18 - sfx_5 255 - sfx_1 223 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_1 143 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_1 79 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_1 31 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_1 223 - sfx_1 0 - sfx_5 0 - sfx_6 10 - sfx_5 255 - sfx_1 223 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_1 143 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_1 79 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_1 31 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 - sfx_0 0, 5 - sfx_0 0, 81 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 18 + sfx_pitch_offset -1 + sfx_env 13, -7 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_env 8, -7 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_env 4, -7 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_env 1, -7 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_env 13, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 10 + sfx_pitch_offset -1 + sfx_env 13, -7 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_env 8, -7 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_env 4, -7 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_env 1, -7 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 + sfx_freq 64.16 + sfx_freq 66.64 sfx_end diff --git a/src/audio/sfx/sfx_border_spark.asm b/src/audio/sfx/sfx_border_spark.asm index 1c5bba11..124611a9 100644 --- a/src/audio/sfx/sfx_border_spark.asm +++ b/src/audio/sfx/sfx_border_spark.asm @@ -1,34 +1,34 @@ Sfx_BorderSpark_Ch1: - sfx_8 17 - sfx_1 97 + sfx_pan %00010001 + sfx_env 6, 1 sfx_loop 2 - sfx_0 0, 15 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 97 - sfx_0 0, 45 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 97 + sfx_freq 64.47 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 6, 1 + sfx_freq 65.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 6, 1 sfx_endloop - sfx_1 129 - sfx_0 0, 15 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 129 - sfx_1 65 - sfx_0 0, 45 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 65 - sfx_1 33 - sfx_0 0, 15 + sfx_env 8, 1 + sfx_freq 64.47 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 1 + sfx_env 4, 1 + sfx_freq 65.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 1 + sfx_env 2, 1 + sfx_freq 64.47 sfx_end diff --git a/src/audio/sfx/sfx_boyfriends.asm b/src/audio/sfx/sfx_boyfriends.asm index d8a49c8f..e52af901 100644 --- a/src/audio/sfx/sfx_boyfriends.asm +++ b/src/audio/sfx/sfx_boyfriends.asm @@ -1,137 +1,137 @@ Sfx_Boyfriends_Ch1: - sfx_8 17 - sfx_1 87 - sfx_2 0 - sfx_0 7, 131 - sfx_5 0 - sfx_6 1 - sfx_0 7, 138 - sfx_6 1 - sfx_0 7, 144 - sfx_6 1 - sfx_0 7, 151 - sfx_6 1 - sfx_0 7, 157 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 167 - sfx_6 1 - sfx_8 17 - sfx_1 103 - sfx_2 0 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 177 - sfx_6 1 - sfx_0 7, 182 - sfx_6 1 - sfx_0 7, 186 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_8 17 - sfx_1 119 - sfx_2 4 - sfx_0 7, 193 - sfx_6 1 - sfx_0 7, 197 - sfx_6 1 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 203 - sfx_6 1 - sfx_0 7, 206 - sfx_6 1 - sfx_0 7, 209 - sfx_6 1 - sfx_0 7, 212 - sfx_6 1 - sfx_8 17 - sfx_1 135 - sfx_2 4 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 217 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 221 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_8 17 - sfx_1 119 - sfx_2 4 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 221 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 217 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 212 - sfx_6 1 - sfx_8 17 - sfx_1 103 - sfx_2 4 - sfx_0 7, 209 - sfx_6 1 - sfx_0 7, 206 - sfx_6 1 - sfx_0 7, 203 - sfx_6 1 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 197 - sfx_6 1 - sfx_0 7, 193 - sfx_6 1 - sfx_8 17 - sfx_1 207 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_8 17 - sfx_1 143 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_8 17 - sfx_1 79 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_8 17 - sfx_1 31 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_pan %00010001 + sfx_env 5, 7 + sfx_duty 0 + sfx_freq 1048.58 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 1110.78 + sfx_wait 1 + sfx_freq 1170.29 + sfx_wait 1 + sfx_freq 1248.30 + sfx_wait 1 + sfx_freq 1323.96 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1472.72 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 6, 7 + sfx_duty 0 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 1659.14 + sfx_wait 1 + sfx_freq 1771.24 + sfx_wait 1 + sfx_freq 1872.46 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 7, 7 + sfx_duty 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_freq 2221.56 + sfx_wait 1 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 2473.06 + sfx_wait 1 + sfx_freq 2621.44 + sfx_wait 1 + sfx_freq 2788.77 + sfx_wait 1 + sfx_freq 2978.91 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 8, 7 + sfx_duty 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3360.82 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3744.91 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 7, 7 + sfx_duty 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3744.91 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3360.82 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 2978.91 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 6, 7 + sfx_duty 1 + sfx_freq 2788.77 + sfx_wait 1 + sfx_freq 2621.44 + sfx_wait 1 + sfx_freq 2473.06 + sfx_wait 1 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 2221.56 + sfx_wait 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_bubbles.asm b/src/audio/sfx/sfx_bubbles.asm index 562e27fe..995793e7 100644 --- a/src/audio/sfx/sfx_bubbles.asm +++ b/src/audio/sfx/sfx_bubbles.asm @@ -1,380 +1,380 @@ Sfx_Bubbles_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 209 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 219 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_1 148 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 209 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 219 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 148 - sfx_1 132 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 209 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 219 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 132 - sfx_1 68 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 209 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 219 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 68 - sfx_1 36 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 209 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 219 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 36 - sfx_1 20 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 209 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 219 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 20 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 2788.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 3120.76 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 3542.49 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_env 9, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 2788.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 3120.76 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 3542.49 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, 4 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 2788.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 3120.76 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 3542.49 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, 4 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 2788.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 3120.76 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 3542.49 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, 4 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 2788.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 3120.76 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 3542.49 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, 4 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 2788.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 3120.76 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 3542.49 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, 4 sfx_end diff --git a/src/audio/sfx/sfx_cancel.asm b/src/audio/sfx/sfx_cancel.asm index e75e97d5..ed5f90a6 100644 --- a/src/audio/sfx/sfx_cancel.asm +++ b/src/audio/sfx/sfx_cancel.asm @@ -1,32 +1,32 @@ Sfx_Cancel_Ch1: - sfx_1 212 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_1 0 - sfx_5 0 - sfx_6 3 - sfx_5 255 - sfx_1 212 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 212 - sfx_0 7, 89 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 212 - sfx_0 7, 79 - sfx_1 100 - sfx_8 17 - sfx_2 0 - sfx_0 7, 167 - sfx_1 52 - sfx_8 17 - sfx_2 0 - sfx_0 7, 167 + sfx_env 13, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 3 + sfx_pitch_offset -1 + sfx_env 13, 4 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 13, 4 + sfx_freq 784.86 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 13, 4 + sfx_freq 740.52 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1472.72 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1472.72 sfx_end diff --git a/src/audio/sfx/sfx_card_shuffle.asm b/src/audio/sfx/sfx_card_shuffle.asm index 7b67bc7a..0dd9ccd7 100644 --- a/src/audio/sfx/sfx_card_shuffle.asm +++ b/src/audio/sfx/sfx_card_shuffle.asm @@ -1,28 +1,28 @@ Sfx_CardShuffle_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 240 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 240 - sfx_1 128 - sfx_0 0, 38 - sfx_0 0, 38 - sfx_0 0, 38 - sfx_0 0, 38 - sfx_1 32 - sfx_0 0, 38 - sfx_0 0, 38 - sfx_0 0, 38 - sfx_0 0, 38 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 255 - sfx_1 32 + sfx_env 15, 0 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, 0 + sfx_env 8, 0 + sfx_freq 65.21 + sfx_freq 65.21 + sfx_freq 65.21 + sfx_freq 65.21 + sfx_env 2, 0 + sfx_freq 65.21 + sfx_freq 65.21 + sfx_freq 65.21 + sfx_freq 65.21 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset -1 + sfx_env 2, 0 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_cat_punch.asm b/src/audio/sfx/sfx_cat_punch.asm index b91ad825..143d2183 100644 --- a/src/audio/sfx/sfx_cat_punch.asm +++ b/src/audio/sfx/sfx_cat_punch.asm @@ -1,53 +1,53 @@ Sfx_CatPunch_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 0 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 193 - sfx_0 7, 197 - sfx_0 7, 200 - sfx_0 7, 203 - sfx_0 7, 206 - sfx_1 223 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 193 - sfx_0 7, 190 - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 172 - sfx_1 191 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 7, 157 - sfx_0 7, 144 - sfx_0 7, 131 - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 7, 123 - sfx_0 7, 107 - sfx_0 7, 89 - sfx_0 7, 68 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 57 - sfx_0 7, 33 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_0 6, 246 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 6, 214 - sfx_0 6, 178 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 2080.51 + sfx_freq 2221.56 + sfx_freq 2340.57 + sfx_freq 2473.06 + sfx_freq 2621.44 + sfx_env 13, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2080.51 + sfx_freq 1985.94 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1560.38 + sfx_env 11, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 1323.96 + sfx_freq 1170.29 + sfx_freq 1048.58 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 985.50 + sfx_freq 879.68 + sfx_freq 784.86 + sfx_freq 697.19 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 658.65 + sfx_freq 587.77 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_freq 492.75 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 439.84 + sfx_freq 392.43 sfx_end diff --git a/src/audio/sfx/sfx_coin_toss.asm b/src/audio/sfx/sfx_coin_toss.asm index 5fb90c0e..83d7aad8 100644 --- a/src/audio/sfx/sfx_coin_toss.asm +++ b/src/audio/sfx/sfx_coin_toss.asm @@ -1,90 +1,90 @@ Sfx_CoinToss_Ch1: - sfx_8 17 - sfx_1 239 - sfx_2 0 - sfx_0 7, 223 - sfx_5 0 - sfx_6 1 - sfx_0 7, 212 - sfx_6 1 - sfx_0 7, 209 - sfx_6 1 - sfx_8 17 - sfx_1 239 - sfx_2 0 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_8 17 - sfx_1 175 - sfx_2 0 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_8 17 - sfx_1 143 - sfx_2 0 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_8 17 - sfx_1 79 - sfx_2 0 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_8 17 - sfx_1 47 - sfx_2 0 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_8 17 - sfx_1 31 - sfx_2 0 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 - sfx_0 7, 214 + sfx_pan %00010001 + sfx_env 14, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 2978.91 + sfx_wait 1 + sfx_freq 2788.77 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 14, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_pan %00010001 + sfx_env 10, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_pan %00010001 + sfx_env 2, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 + sfx_freq 3120.76 sfx_end diff --git a/src/audio/sfx/sfx_coin_toss_heads.asm b/src/audio/sfx/sfx_coin_toss_heads.asm index 92101476..1b1e08be 100644 --- a/src/audio/sfx/sfx_coin_toss_heads.asm +++ b/src/audio/sfx/sfx_coin_toss_heads.asm @@ -1,30 +1,30 @@ Sfx_CoinTossHeads_Ch1: - sfx_1 231 - sfx_8 17 - sfx_2 8 - sfx_0 7, 172 - sfx_0 7, 190 - sfx_0 7, 200 - sfx_0 7, 212 - sfx_1 135 - sfx_8 17 - sfx_2 8 - sfx_0 7, 212 - sfx_5 0 - sfx_6 1 - sfx_1 71 - sfx_8 17 - sfx_2 8 - sfx_0 7, 214 - sfx_6 1 - sfx_1 39 - sfx_8 17 - sfx_2 8 - sfx_0 7, 214 - sfx_6 1 - sfx_1 23 - sfx_8 17 - sfx_2 8 - sfx_0 7, 214 - sfx_6 1 + sfx_env 14, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1560.38 + sfx_freq 1985.94 + sfx_freq 2340.57 + sfx_freq 2978.91 + sfx_env 8, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 2978.91 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_env 4, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 2, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 1, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3120.76 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_coin_toss_tails.asm b/src/audio/sfx/sfx_coin_toss_tails.asm index 2d41243c..bb052d97 100644 --- a/src/audio/sfx/sfx_coin_toss_tails.asm +++ b/src/audio/sfx/sfx_coin_toss_tails.asm @@ -1,25 +1,25 @@ Sfx_CoinTossTails_Ch1: - sfx_1 231 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_0 7, 33 - sfx_0 6, 246 - sfx_0 6, 158 - sfx_1 103 - sfx_8 17 - sfx_2 8 - sfx_0 6, 158 - sfx_5 0 - sfx_6 1 - sfx_1 55 - sfx_8 17 - sfx_2 8 - sfx_0 6, 137 - sfx_6 1 - sfx_1 23 - sfx_8 17 - sfx_2 8 - sfx_0 6, 137 - sfx_6 1 + sfx_env 14, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_freq 587.77 + sfx_freq 492.75 + sfx_freq 370.26 + sfx_env 6, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 370.26 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_env 3, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 349.53 + sfx_wait 1 + sfx_env 1, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 349.53 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_confirm.asm b/src/audio/sfx/sfx_confirm.asm index 1c9fd28c..c60797d8 100644 --- a/src/audio/sfx/sfx_confirm.asm +++ b/src/audio/sfx/sfx_confirm.asm @@ -1,36 +1,36 @@ Sfx_Confirm_Ch1: - sfx_1 194 - sfx_8 17 - sfx_2 8 - sfx_0 7, 172 - sfx_5 0 - sfx_6 1 - sfx_0 7, 193 - sfx_6 1 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 132 - sfx_8 17 - sfx_2 4 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 193 - sfx_6 1 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 36 - sfx_8 17 - sfx_2 0 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 193 - sfx_6 1 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 + sfx_env 12, 2 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1560.38 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_confuse_ray.asm b/src/audio/sfx/sfx_confuse_ray.asm index dc121507..0aa25d36 100644 --- a/src/audio/sfx/sfx_confuse_ray.asm +++ b/src/audio/sfx/sfx_confuse_ray.asm @@ -1,107 +1,107 @@ Sfx_ConfuseRay_Ch1: - sfx_8 17 - sfx_1 255 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 239 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 223 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 207 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 191 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 175 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 159 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 223 - sfx_0 7, 219 - sfx_8 17 - sfx_1 143 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 127 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 223 - sfx_0 7, 219 - sfx_8 17 - sfx_1 111 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 95 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 223 - sfx_0 7, 219 - sfx_8 17 - sfx_1 79 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 63 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 223 - sfx_0 7, 219 - sfx_8 17 - sfx_1 47 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_8 17 - sfx_1 31 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 223 - sfx_0 7, 219 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 14, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 11, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 10, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 3971.88 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 7, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 3971.88 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 5, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 3971.88 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 3, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 3971.88 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 2, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 3971.88 + sfx_freq 3542.49 sfx_end diff --git a/src/audio/sfx/sfx_confusion.asm b/src/audio/sfx/sfx_confusion.asm index bf430f72..679146ae 100644 --- a/src/audio/sfx/sfx_confusion.asm +++ b/src/audio/sfx/sfx_confusion.asm @@ -1,92 +1,92 @@ Sfx_Confusion_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 190 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 182 - sfx_1 196 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 190 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 182 - sfx_1 164 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 190 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 182 - sfx_1 132 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 190 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 182 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 190 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 182 - sfx_1 20 - sfx_8 17 - sfx_2 0 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_0 7, 190 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 182 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 1985.94 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1771.24 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 1985.94 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1771.24 + sfx_env 10, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 1985.94 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1771.24 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 1985.94 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1771.24 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 1985.94 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1771.24 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_freq 1985.94 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1771.24 sfx_end diff --git a/src/audio/sfx/sfx_cry.asm b/src/audio/sfx/sfx_cry.asm index b101dfe4..16345380 100644 --- a/src/audio/sfx/sfx_cry.asm +++ b/src/audio/sfx/sfx_cry.asm @@ -1,65 +1,65 @@ Sfx_Cry_Ch1: sfx_loop 17 - sfx_1 135 - sfx_8 17 - sfx_2 0 - sfx_0 6, 11 - sfx_5 0 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 + sfx_env 8, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 261.62 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 sfx_endloop sfx_loop 4 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_6 1 - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 6, 246 - sfx_6 1 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 6, 214 - sfx_6 1 - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 6, 196 - sfx_6 1 - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 6, 178 - sfx_6 1 - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 6, 158 - sfx_6 1 - sfx_0 6, 137 - sfx_6 1 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 6, 114 - sfx_6 1 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 6, 91 - sfx_6 1 - sfx_0 6, 66 - sfx_6 1 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 6, 40 - sfx_6 1 - sfx_0 6, 11 - sfx_6 1 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_wait 1 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 492.75 + sfx_wait 1 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 439.84 + sfx_wait 1 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 414.78 + sfx_wait 1 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 392.43 + sfx_wait 1 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 370.26 + sfx_wait 1 + sfx_freq 349.53 + sfx_wait 1 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 329.33 + sfx_wait 1 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 311.33 + sfx_wait 1 + sfx_freq 293.88 + sfx_wait 1 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 277.69 + sfx_wait 1 + sfx_freq 261.62 + sfx_wait 1 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_cursor.asm b/src/audio/sfx/sfx_cursor.asm index 6483ecfd..3fcfac78 100644 --- a/src/audio/sfx/sfx_cursor.asm +++ b/src/audio/sfx/sfx_cursor.asm @@ -1,15 +1,15 @@ Sfx_Cursor_Ch1: - sfx_1 196 - sfx_8 17 - sfx_2 0 - sfx_0 7, 172 - sfx_0 7, 193 - sfx_1 100 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_1 52 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1560.38 + sfx_freq 2080.51 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 sfx_end diff --git a/src/audio/sfx/sfx_dark_gas.asm b/src/audio/sfx/sfx_dark_gas.asm index c77824f5..77973783 100644 --- a/src/audio/sfx/sfx_dark_gas.asm +++ b/src/audio/sfx/sfx_dark_gas.asm @@ -1,50 +1,50 @@ Sfx_DarkGas_Ch1: - sfx_8 17 - sfx_1 47 - sfx_0 0, 8 - sfx_0 0, 8 - sfx_0 0, 8 - sfx_1 79 - sfx_0 0, 7 - sfx_0 0, 7 - sfx_0 0, 7 - sfx_1 111 - sfx_0 0, 6 - sfx_0 0, 6 - sfx_0 0, 6 - sfx_1 143 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 + sfx_pan %00010001 + sfx_env 2, -7 + sfx_freq 64.25 + sfx_freq 64.25 + sfx_freq 64.25 + sfx_env 4, -7 + sfx_freq 64.22 + sfx_freq 64.22 + sfx_freq 64.22 + sfx_env 6, -7 + sfx_freq 64.19 + sfx_freq 64.19 + sfx_freq 64.19 + sfx_env 8, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 sfx_loop 12 - sfx_1 207 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 + sfx_env 12, -7 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 sfx_endloop - sfx_1 143 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 111 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 79 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 47 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 + sfx_env 8, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 6, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 4, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 2, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 sfx_end diff --git a/src/audio/sfx/sfx_denied.asm b/src/audio/sfx/sfx_denied.asm index 2b0a7f74..7ff5c730 100644 --- a/src/audio/sfx/sfx_denied.asm +++ b/src/audio/sfx/sfx_denied.asm @@ -1,23 +1,23 @@ Sfx_Denied_Ch1: - sfx_1 240 - sfx_8 17 - sfx_2 0 - sfx_0 4, 229 - sfx_0 4, 229 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 255 - sfx_1 240 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 4, 229 + sfx_env 15, 0 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 164.87 + sfx_freq 164.87 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset -1 + sfx_env 15, 0 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 164.87 sfx_end diff --git a/src/audio/sfx/sfx_dive_bomb.asm b/src/audio/sfx/sfx_dive_bomb.asm index 0dd8a6b6..83af5f89 100644 --- a/src/audio/sfx/sfx_dive_bomb.asm +++ b/src/audio/sfx/sfx_dive_bomb.asm @@ -1,91 +1,91 @@ Sfx_DiveBomb_Ch1: - sfx_8 17 - sfx_1 111 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 83 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.70 sfx_loop 5 - sfx_1 246 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 + sfx_env 15, 6 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 sfx_endloop - sfx_1 134 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_1 70 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 65 + sfx_env 8, 6 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_env 4, 6 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.10 sfx_loop 16 - sfx_1 255 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 83 + sfx_env 15, -7 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.70 sfx_endloop - sfx_1 143 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 79 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 47 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 31 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 + sfx_env 8, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 4, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 2, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 1, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 sfx_end diff --git a/src/audio/sfx/sfx_drain.asm b/src/audio/sfx/sfx_drain.asm index 2d6bd0e8..b063b074 100644 --- a/src/audio/sfx/sfx_drain.asm +++ b/src/audio/sfx/sfx_drain.asm @@ -1,95 +1,95 @@ Sfx_Drain_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 157 - sfx_0 7, 190 - sfx_0 7, 144 - sfx_0 7, 182 - sfx_0 7, 131 - sfx_0 7, 172 - sfx_0 7, 123 - sfx_0 7, 162 - sfx_0 7, 107 - sfx_0 7, 157 - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 57 - sfx_0 7, 123 - sfx_0 7, 33 - sfx_0 7, 107 - sfx_0 7, 5 - sfx_0 7, 89 - sfx_0 6, 246 - sfx_0 7, 68 - sfx_0 6, 214 - sfx_0 7, 57 - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 6, 246 - sfx_0 6, 66 - sfx_0 6, 214 - sfx_0 6, 11 - sfx_0 6, 178 - sfx_0 5, 237 - sfx_0 6, 137 - sfx_0 5, 172 - sfx_0 6, 114 - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 190 - sfx_0 7, 144 - sfx_0 7, 182 - sfx_0 7, 131 - sfx_0 7, 172 - sfx_0 7, 123 - sfx_0 7, 162 - sfx_0 7, 107 - sfx_0 7, 157 - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 33 - sfx_0 7, 107 - sfx_0 7, 5 - sfx_0 7, 89 - sfx_0 6, 246 - sfx_0 7, 68 - sfx_0 6, 214 - sfx_0 7, 57 - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 6, 214 - sfx_0 6, 11 - sfx_0 6, 178 - sfx_0 5, 237 - sfx_0 6, 137 - sfx_0 5, 172 - sfx_0 6, 114 - sfx_1 132 - sfx_8 17 - sfx_2 0 - sfx_0 6, 114 - sfx_0 6, 246 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_0 6, 214 - sfx_1 36 - sfx_8 17 - sfx_2 0 - sfx_0 6, 11 - sfx_0 6, 178 - sfx_1 20 - sfx_8 17 - sfx_2 0 - sfx_0 5, 237 - sfx_0 6, 137 - sfx_0 5, 172 - sfx_0 6, 114 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1323.96 + sfx_freq 1985.94 + sfx_freq 1170.29 + sfx_freq 1771.24 + sfx_freq 1048.58 + sfx_freq 1560.38 + sfx_freq 985.50 + sfx_freq 1394.38 + sfx_freq 879.68 + sfx_freq 1323.96 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 658.65 + sfx_freq 985.50 + sfx_freq 587.77 + sfx_freq 879.68 + sfx_freq 522.20 + sfx_freq 784.86 + sfx_freq 492.75 + sfx_freq 697.19 + sfx_freq 439.84 + sfx_freq 658.65 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 492.75 + sfx_freq 293.88 + sfx_freq 439.84 + sfx_freq 261.62 + sfx_freq 392.43 + sfx_freq 246.84 + sfx_freq 349.53 + sfx_freq 219.92 + sfx_freq 329.33 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1985.94 + sfx_freq 1170.29 + sfx_freq 1771.24 + sfx_freq 1048.58 + sfx_freq 1560.38 + sfx_freq 985.50 + sfx_freq 1394.38 + sfx_freq 879.68 + sfx_freq 1323.96 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 587.77 + sfx_freq 879.68 + sfx_freq 522.20 + sfx_freq 784.86 + sfx_freq 492.75 + sfx_freq 697.19 + sfx_freq 439.84 + sfx_freq 658.65 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 439.84 + sfx_freq 261.62 + sfx_freq 392.43 + sfx_freq 246.84 + sfx_freq 349.53 + sfx_freq 219.92 + sfx_freq 329.33 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 329.33 + sfx_freq 492.75 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_freq 439.84 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 261.62 + sfx_freq 392.43 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 246.84 + sfx_freq 349.53 + sfx_freq 219.92 + sfx_freq 329.33 sfx_end diff --git a/src/audio/sfx/sfx_drill.asm b/src/audio/sfx/sfx_drill.asm index 18d5a192..a96f70d3 100644 --- a/src/audio/sfx/sfx_drill.asm +++ b/src/audio/sfx/sfx_drill.asm @@ -1,16 +1,16 @@ Sfx_Drill_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 8 - sfx_1 129 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 + sfx_env 8, 1 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 sfx_endloop sfx_loop 10 - sfx_1 241 - sfx_0 0, 81 - sfx_0 0, 209 - sfx_0 0, 17 + sfx_env 15, 1 + sfx_freq 66.64 + sfx_freq 71.27 + sfx_freq 64.54 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_expand.asm b/src/audio/sfx/sfx_expand.asm index 0ad8b3eb..9bca9be6 100644 --- a/src/audio/sfx/sfx_expand.asm +++ b/src/audio/sfx/sfx_expand.asm @@ -1,203 +1,203 @@ Sfx_Expand_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 172 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 162 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 157 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 144 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 89 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 68 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 11 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 246 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 214 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 178 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 137 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 114 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_0 6, 66 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 239 - sfx_1 239 - sfx_8 17 - sfx_2 8 - sfx_0 6, 11 - sfx_0 6, 40 - sfx_0 6, 66 - sfx_0 7, 5 - sfx_0 7, 20 - sfx_0 7, 33 - sfx_0 7, 45 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 57 - sfx_5 0 - sfx_6 1 - sfx_0 7, 68 - sfx_6 1 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 79 - sfx_6 1 - sfx_0 7, 89 - sfx_6 1 - sfx_1 127 - sfx_8 17 - sfx_2 8 - sfx_0 7, 98 - sfx_6 1 - sfx_0 7, 107 - sfx_6 1 - sfx_1 111 - sfx_8 17 - sfx_2 8 - sfx_0 7, 107 - sfx_6 1 - sfx_0 7, 115 - sfx_6 1 - sfx_1 95 - sfx_8 17 - sfx_2 8 - sfx_0 7, 123 - sfx_6 1 - sfx_0 7, 131 - sfx_6 1 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_6 1 - sfx_0 7, 138 - sfx_6 1 - sfx_1 63 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_6 1 - sfx_0 7, 151 - sfx_6 1 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 167 - sfx_6 1 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 1560.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 1394.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 1323.96 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 1170.29 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 784.86 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 697.19 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 261.62 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 492.75 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 439.84 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 392.43 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 349.53 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 329.33 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_freq 293.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, -7 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 261.62 + sfx_freq 277.69 + sfx_freq 293.88 + sfx_freq 522.20 + sfx_freq 555.39 + sfx_freq 587.77 + sfx_freq 621.19 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 658.65 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 697.19 + sfx_wait 1 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 740.52 + sfx_wait 1 + sfx_freq 784.86 + sfx_wait 1 + sfx_env 7, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 829.57 + sfx_wait 1 + sfx_freq 879.68 + sfx_wait 1 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 879.68 + sfx_wait 1 + sfx_freq 929.59 + sfx_wait 1 + sfx_env 5, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 985.50 + sfx_wait 1 + sfx_freq 1048.58 + sfx_wait 1 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_wait 1 + sfx_freq 1110.78 + sfx_wait 1 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_wait 1 + sfx_freq 1248.30 + sfx_wait 1 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1472.72 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_fire_punch.asm b/src/audio/sfx/sfx_fire_punch.asm index 9ba4b457..9b002b8d 100644 --- a/src/audio/sfx/sfx_fire_punch.asm +++ b/src/audio/sfx/sfx_fire_punch.asm @@ -1,145 +1,145 @@ Sfx_FirePunch_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 143 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 45 - sfx_5 255 - sfx_1 31 - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 143 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 45 - sfx_5 255 - sfx_1 31 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 45 + sfx_pitch_offset -1 + sfx_env 1, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 45 + sfx_pitch_offset -1 + sfx_env 1, -7 sfx_end Sfx_FirePunch_Ch2: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 0 - sfx_5 0 - sfx_6 20 - sfx_5 255 - sfx_1 1 - sfx_1 223 - sfx_0 0, 80 - sfx_0 0, 87 - sfx_0 0, 80 - sfx_0 0, 87 - sfx_0 0, 80 - sfx_1 207 - sfx_0 0, 87 - sfx_0 0, 80 - sfx_0 0, 87 - sfx_0 0, 80 - sfx_0 0, 87 - sfx_1 191 - sfx_0 0, 80 - sfx_0 0, 87 - sfx_0 0, 80 - sfx_0 0, 87 - sfx_0 0, 80 - sfx_1 175 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_1 143 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_1 79 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_1 31 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 20 + sfx_pitch_offset -1 + sfx_env 0, 1 + sfx_env 13, -7 + sfx_freq 66.60 + sfx_freq 66.84 + sfx_freq 66.60 + sfx_freq 66.84 + sfx_freq 66.60 + sfx_env 12, -7 + sfx_freq 66.84 + sfx_freq 66.60 + sfx_freq 66.84 + sfx_freq 66.60 + sfx_freq 66.84 + sfx_env 11, -7 + sfx_freq 66.60 + sfx_freq 66.84 + sfx_freq 66.60 + sfx_freq 66.84 + sfx_freq 66.60 + sfx_env 10, -7 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_env 8, -7 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_env 4, -7 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_env 1, -7 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_fire_spin.asm b/src/audio/sfx/sfx_fire_spin.asm index 7cf6e9a0..1d4f322a 100644 --- a/src/audio/sfx/sfx_fire_spin.asm +++ b/src/audio/sfx/sfx_fire_spin.asm @@ -1,132 +1,132 @@ Sfx_FireSpin_Ch1: - sfx_8 17 - sfx_1 111 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_1 246 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_1 198 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_1 134 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 52 - sfx_1 102 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 68 - sfx_0 0, 67 - sfx_0 0, 68 - sfx_0 0, 67 - sfx_0 0, 68 - sfx_0 0, 67 - sfx_0 0, 68 - sfx_1 70 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 68 - sfx_0 0, 67 - sfx_0 0, 68 - sfx_0 0, 67 - sfx_0 0, 68 - sfx_1 54 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_1 38 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 22 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_env 15, 6 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_env 12, 6 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_env 8, 6 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.67 + sfx_env 6, 6 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 66.20 + sfx_freq 66.16 + sfx_freq 66.20 + sfx_freq 66.16 + sfx_freq 66.20 + sfx_freq 66.16 + sfx_freq 66.20 + sfx_env 4, 6 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 66.20 + sfx_freq 66.16 + sfx_freq 66.20 + sfx_freq 66.16 + sfx_freq 66.20 + sfx_env 3, 6 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_env 2, 6 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 1, 6 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 sfx_end diff --git a/src/audio/sfx/sfx_firegiver.asm b/src/audio/sfx/sfx_firegiver.asm index 71e734e8..5c432519 100644 --- a/src/audio/sfx/sfx_firegiver.asm +++ b/src/audio/sfx/sfx_firegiver.asm @@ -1,149 +1,149 @@ Sfx_Firegiver_Ch1: - sfx_1 0 - sfx_5 0 - sfx_6 20 - sfx_5 255 - sfx_1 1 - sfx_1 228 - sfx_8 17 - sfx_2 0 - sfx_0 6, 11 - sfx_5 0 - sfx_6 1 - sfx_0 6, 114 - sfx_6 1 - sfx_0 6, 66 - sfx_6 1 - sfx_0 6, 137 - sfx_6 1 - sfx_0 6, 114 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 - sfx_0 6, 137 - sfx_6 1 - sfx_0 6, 214 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 - sfx_0 6, 246 - sfx_6 1 - sfx_1 100 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_6 1 - sfx_0 7, 57 - sfx_6 1 - sfx_0 7, 33 - sfx_6 1 - sfx_0 7, 68 - sfx_6 1 - sfx_0 7, 57 - sfx_6 1 - sfx_0 7, 89 - sfx_6 1 - sfx_0 7, 68 - sfx_6 1 - sfx_0 7, 107 - sfx_6 1 - sfx_0 7, 89 - sfx_6 1 - sfx_0 7, 123 - sfx_6 1 - sfx_1 52 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_6 1 - sfx_0 7, 157 - sfx_6 1 - sfx_0 7, 144 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 157 - sfx_6 1 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 182 - sfx_6 1 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 10 - sfx_5 0 - sfx_1 52 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 20 + sfx_pitch_offset -1 + sfx_env 0, 1 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 261.62 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 329.33 + sfx_wait 1 + sfx_freq 293.88 + sfx_wait 1 + sfx_freq 349.53 + sfx_wait 1 + sfx_freq 329.33 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 + sfx_freq 349.53 + sfx_wait 1 + sfx_freq 439.84 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 + sfx_freq 492.75 + sfx_wait 1 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_wait 1 + sfx_freq 658.65 + sfx_wait 1 + sfx_freq 587.77 + sfx_wait 1 + sfx_freq 697.19 + sfx_wait 1 + sfx_freq 658.65 + sfx_wait 1 + sfx_freq 784.86 + sfx_wait 1 + sfx_freq 697.19 + sfx_wait 1 + sfx_freq 879.68 + sfx_wait 1 + sfx_freq 784.86 + sfx_wait 1 + sfx_freq 985.50 + sfx_wait 1 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_wait 1 + sfx_freq 1323.96 + sfx_wait 1 + sfx_freq 1170.29 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1323.96 + sfx_wait 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1771.24 + sfx_wait 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 10 + sfx_pitch_offset 0 + sfx_env 3, 4 sfx_loop 6 - sfx_1 228 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 0 - sfx_1 228 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 0 - sfx_1 228 - sfx_0 7, 89 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 0 - sfx_1 228 - sfx_0 7, 144 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 0 - sfx_1 228 - sfx_0 7, 162 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 0 - sfx_1 228 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 5 - sfx_5 0 - sfx_1 228 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 784.86 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 1170.29 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 1394.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 5 + sfx_pitch_offset 0 + sfx_env 14, 4 sfx_endloop sfx_end Sfx_Firegiver_Ch2: sfx_loop 65 - sfx_1 127 - sfx_8 17 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 83 + sfx_env 7, -7 + sfx_pan %00010001 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.70 sfx_endloop - sfx_1 95 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 79 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 47 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 31 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 + sfx_env 5, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 4, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 2, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 1, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 sfx_end diff --git a/src/audio/sfx/sfx_firegiver_start.asm b/src/audio/sfx/sfx_firegiver_start.asm index a9b7e0e3..b948e5aa 100644 --- a/src/audio/sfx/sfx_firegiver_start.asm +++ b/src/audio/sfx/sfx_firegiver_start.asm @@ -1,25 +1,25 @@ Sfx_FiregiverStart_Ch1: sfx_loop 30 - sfx_1 191 - sfx_8 17 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 83 + sfx_env 11, -7 + sfx_pan %00010001 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.70 sfx_endloop - sfx_1 95 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 79 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 47 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 31 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 + sfx_env 5, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 4, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 2, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 1, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 sfx_end diff --git a/src/audio/sfx/sfx_fury_swipes.asm b/src/audio/sfx/sfx_fury_swipes.asm index c6bfb180..fa238e20 100644 --- a/src/audio/sfx/sfx_fury_swipes.asm +++ b/src/audio/sfx/sfx_fury_swipes.asm @@ -1,85 +1,85 @@ Sfx_FurySwipes_Ch1: - sfx_8 17 - sfx_1 214 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 255 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_1 223 - sfx_0 0, 33 - sfx_0 0, 50 - sfx_0 0, 33 - sfx_0 0, 50 - sfx_1 127 - sfx_0 0, 34 - sfx_0 0, 51 - sfx_0 0, 34 - sfx_0 0, 51 - sfx_1 223 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 255 - sfx_0 0, 65 - sfx_0 0, 49 - sfx_0 0, 65 - sfx_0 0, 49 - sfx_0 0, 65 - sfx_0 0, 49 - sfx_0 0, 65 - sfx_0 0, 49 - sfx_1 223 - sfx_0 0, 65 - sfx_0 0, 50 - sfx_0 0, 65 - sfx_0 0, 50 - sfx_1 127 - sfx_0 0, 66 - sfx_0 0, 51 - sfx_0 0, 66 - sfx_0 0, 51 - sfx_1 214 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 255 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_1 223 - sfx_0 0, 33 - sfx_0 0, 50 - sfx_1 143 - sfx_0 0, 33 - sfx_0 0, 50 - sfx_0 0, 34 - sfx_0 0, 51 - sfx_1 111 - sfx_0 0, 34 - sfx_0 0, 51 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_1 79 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_1 47 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_0 0, 36 - sfx_0 0, 53 + sfx_pan %00010001 + sfx_env 13, 6 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 15, -7 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_env 13, -7 + sfx_freq 65.05 + sfx_freq 65.60 + sfx_freq 65.05 + sfx_freq 65.60 + sfx_env 7, -7 + sfx_freq 65.08 + sfx_freq 65.63 + sfx_freq 65.08 + sfx_freq 65.63 + sfx_env 13, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 15, -7 + sfx_freq 66.10 + sfx_freq 65.57 + sfx_freq 66.10 + sfx_freq 65.57 + sfx_freq 66.10 + sfx_freq 65.57 + sfx_freq 66.10 + sfx_freq 65.57 + sfx_env 13, -7 + sfx_freq 66.10 + sfx_freq 65.60 + sfx_freq 66.10 + sfx_freq 65.60 + sfx_env 7, -7 + sfx_freq 66.13 + sfx_freq 65.63 + sfx_freq 66.13 + sfx_freq 65.63 + sfx_env 13, 6 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 15, -7 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_env 13, -7 + sfx_freq 65.05 + sfx_freq 65.60 + sfx_env 8, -7 + sfx_freq 65.05 + sfx_freq 65.60 + sfx_freq 65.08 + sfx_freq 65.63 + sfx_env 6, -7 + sfx_freq 65.08 + sfx_freq 65.63 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_env 4, -7 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_env 2, -7 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_freq 65.15 + sfx_freq 65.70 sfx_end diff --git a/src/audio/sfx/sfx_glow.asm b/src/audio/sfx/sfx_glow.asm index 1a207814..1e7ce1cf 100644 --- a/src/audio/sfx/sfx_glow.asm +++ b/src/audio/sfx/sfx_glow.asm @@ -1,92 +1,92 @@ Sfx_Glow_Ch1: - sfx_8 17 - sfx_1 241 - sfx_2 0 - sfx_0 4, 22 - sfx_0 6, 11 - sfx_0 5, 99 - sfx_0 6, 178 - sfx_0 5, 172 - sfx_0 6, 214 - sfx_8 17 - sfx_1 241 - sfx_2 0 - sfx_0 4, 131 - sfx_0 6, 66 - sfx_0 5, 99 - sfx_0 6, 178 - sfx_0 5, 237 - sfx_0 6, 246 - sfx_8 17 - sfx_1 241 - sfx_2 4 - sfx_0 6, 11 - sfx_0 7, 5 - sfx_0 6, 178 - sfx_0 7, 89 - sfx_0 6, 214 - sfx_0 7, 107 - sfx_8 17 - sfx_1 241 - sfx_2 4 - sfx_0 6, 66 - sfx_0 7, 33 - sfx_0 6, 178 - sfx_0 7, 89 - sfx_0 6, 246 - sfx_0 7, 123 - sfx_8 17 - sfx_1 241 - sfx_2 4 - sfx_0 7, 5 - sfx_0 7, 131 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 107 - sfx_0 7, 182 - sfx_8 17 - sfx_1 241 - sfx_2 4 - sfx_0 7, 33 - sfx_0 7, 144 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 123 - sfx_0 7, 190 - sfx_8 17 - sfx_1 129 - sfx_2 4 - sfx_0 7, 5 - sfx_0 7, 131 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 107 - sfx_0 7, 182 - sfx_8 17 - sfx_1 65 - sfx_2 4 - sfx_0 7, 33 - sfx_0 7, 144 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 123 - sfx_0 7, 190 - sfx_8 17 - sfx_1 33 - sfx_2 4 - sfx_0 7, 5 - sfx_0 7, 131 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 107 - sfx_0 7, 182 - sfx_8 17 - sfx_1 17 - sfx_2 4 - sfx_0 7, 33 - sfx_0 7, 144 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 123 - sfx_0 7, 190 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_duty 0 + sfx_freq 130.81 + sfx_freq 261.62 + sfx_freq 195.92 + sfx_freq 392.43 + sfx_freq 219.92 + sfx_freq 439.84 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_duty 0 + sfx_freq 146.78 + sfx_freq 293.88 + sfx_freq 195.92 + sfx_freq 392.43 + sfx_freq 246.84 + sfx_freq 492.75 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_duty 1 + sfx_freq 261.62 + sfx_freq 522.20 + sfx_freq 392.43 + sfx_freq 784.86 + sfx_freq 439.84 + sfx_freq 879.68 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_duty 1 + sfx_freq 293.88 + sfx_freq 587.77 + sfx_freq 392.43 + sfx_freq 784.86 + sfx_freq 492.75 + sfx_freq 985.50 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_duty 1 + sfx_freq 522.20 + sfx_freq 1048.58 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 879.68 + sfx_freq 1771.24 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_duty 1 + sfx_freq 587.77 + sfx_freq 1170.29 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 985.50 + sfx_freq 1985.94 + sfx_pan %00010001 + sfx_env 8, 1 + sfx_duty 1 + sfx_freq 522.20 + sfx_freq 1048.58 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 879.68 + sfx_freq 1771.24 + sfx_pan %00010001 + sfx_env 4, 1 + sfx_duty 1 + sfx_freq 587.77 + sfx_freq 1170.29 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 985.50 + sfx_freq 1985.94 + sfx_pan %00010001 + sfx_env 2, 1 + sfx_duty 1 + sfx_freq 522.20 + sfx_freq 1048.58 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 879.68 + sfx_freq 1771.24 + sfx_pan %00010001 + sfx_env 1, 1 + sfx_duty 1 + sfx_freq 587.77 + sfx_freq 1170.29 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 985.50 + sfx_freq 1985.94 sfx_end diff --git a/src/audio/sfx/sfx_goo.asm b/src/audio/sfx/sfx_goo.asm index 3a632252..6f78a0c8 100644 --- a/src/audio/sfx/sfx_goo.asm +++ b/src/audio/sfx/sfx_goo.asm @@ -1,123 +1,123 @@ Sfx_Goo_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 115 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 98 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 89 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 79 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 68 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 45 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 20 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 929.59 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 829.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 784.86 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 740.52 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 697.19 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 621.19 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 555.39 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 sfx_end Sfx_Goo_Ch2: - sfx_8 17 - sfx_1 223 - sfx_1 0 - sfx_5 0 - sfx_6 18 - sfx_5 255 - sfx_1 223 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 143 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 111 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 79 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 31 - sfx_0 0, 36 - sfx_0 0, 36 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 18 + sfx_pitch_offset -1 + sfx_env 13, -7 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 8, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 6, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 4, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 1, -7 + sfx_freq 65.15 + sfx_freq 65.15 sfx_end diff --git a/src/audio/sfx/sfx_heal.asm b/src/audio/sfx/sfx_heal.asm index 342330f5..431a5615 100644 --- a/src/audio/sfx/sfx_heal.asm +++ b/src/audio/sfx/sfx_heal.asm @@ -1,93 +1,93 @@ Sfx_Heal_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 196 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 132 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 100 - sfx_8 17 - sfx_2 4 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 36 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 20 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 sfx_end diff --git a/src/audio/sfx/sfx_healing_wind.asm b/src/audio/sfx/sfx_healing_wind.asm index 1fedd9fa..16e91de3 100644 --- a/src/audio/sfx/sfx_healing_wind.asm +++ b/src/audio/sfx/sfx_healing_wind.asm @@ -1,155 +1,155 @@ Sfx_HealingWind_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 196 - sfx_8 17 - sfx_2 4 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 164 - sfx_8 17 - sfx_2 4 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 148 - sfx_8 17 - sfx_2 4 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 132 - sfx_8 17 - sfx_2 4 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 100 - sfx_8 17 - sfx_2 4 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 36 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 - sfx_1 20 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 182 - sfx_0 7, 200 - sfx_0 7, 190 - sfx_0 7, 206 - sfx_0 7, 182 - sfx_0 7, 209 - sfx_0 7, 190 - sfx_0 7, 214 - sfx_0 7, 193 - sfx_0 7, 219 - sfx_0 7, 200 - sfx_0 7, 223 - sfx_0 7, 206 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 10, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 9, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 1771.24 + sfx_freq 2340.57 + sfx_freq 1985.94 + sfx_freq 2621.44 + sfx_freq 1771.24 + sfx_freq 2788.77 + sfx_freq 1985.94 + sfx_freq 3120.76 + sfx_freq 2080.51 + sfx_freq 3542.49 + sfx_freq 2340.57 + sfx_freq 3971.88 + sfx_freq 2621.44 sfx_end diff --git a/src/audio/sfx/sfx_hydro_pump.asm b/src/audio/sfx/sfx_hydro_pump.asm index 1b6c72a5..2841b3e5 100644 --- a/src/audio/sfx/sfx_hydro_pump.asm +++ b/src/audio/sfx/sfx_hydro_pump.asm @@ -1,123 +1,123 @@ Sfx_HydroPump_Ch1: - sfx_8 17 - sfx_1 246 - sfx_0 0, 132 - sfx_0 0, 129 - sfx_0 0, 132 - sfx_0 0, 17 - sfx_0 0, 20 - sfx_0 0, 81 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_1 198 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_1 111 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_1 246 - sfx_0 0, 132 - sfx_0 0, 129 - sfx_0 0, 132 - sfx_0 0, 17 - sfx_0 0, 20 - sfx_0 0, 81 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_1 134 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_0 0, 84 - sfx_0 0, 81 - sfx_1 102 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_0 0, 68 - sfx_0 0, 65 - sfx_1 70 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_0 0, 52 - sfx_0 0, 49 - sfx_1 22 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 - sfx_0 0, 36 - sfx_0 0, 33 + sfx_pan %00010001 + sfx_env 15, 6 + sfx_freq 68.41 + sfx_freq 68.30 + sfx_freq 68.41 + sfx_freq 64.54 + sfx_freq 64.63 + sfx_freq 66.64 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_env 12, 6 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_env 6, -7 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_env 15, 6 + sfx_freq 68.41 + sfx_freq 68.30 + sfx_freq 68.41 + sfx_freq 64.54 + sfx_freq 64.63 + sfx_freq 66.64 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_env 8, 6 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_freq 66.74 + sfx_freq 66.64 + sfx_env 6, 6 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_freq 66.20 + sfx_freq 66.10 + sfx_env 4, 6 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_freq 65.67 + sfx_freq 65.57 + sfx_env 1, 6 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 + sfx_freq 65.15 + sfx_freq 65.05 sfx_end diff --git a/src/audio/sfx/sfx_hyper_beam.asm b/src/audio/sfx/sfx_hyper_beam.asm index c490ea60..a7511e37 100644 --- a/src/audio/sfx/sfx_hyper_beam.asm +++ b/src/audio/sfx/sfx_hyper_beam.asm @@ -1,84 +1,84 @@ Sfx_HyperBeam_Ch1: - sfx_1 100 - sfx_8 17 - sfx_2 4 - sfx_0 7, 186 - sfx_0 7, 190 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1872.46 + sfx_freq 1985.94 sfx_loop 5 - sfx_1 228 - sfx_8 17 - sfx_2 4 - sfx_0 7, 131 - sfx_0 7, 138 - sfx_0 7, 144 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1048.58 + sfx_freq 1110.78 + sfx_freq 1170.29 sfx_endloop - sfx_1 100 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 - sfx_1 52 - sfx_8 17 - sfx_2 0 - sfx_0 7, 131 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1048.58 sfx_end Sfx_HyperBeam_Ch2: - sfx_8 17 - sfx_1 255 - sfx_1 0 - sfx_5 0 - sfx_6 16 - sfx_5 255 - sfx_1 255 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 143 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 79 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 47 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 31 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 16 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 8, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 4, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 2, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 1, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 sfx_end diff --git a/src/audio/sfx/sfx_intro_orb.asm b/src/audio/sfx/sfx_intro_orb.asm index d7768908..271501ba 100644 --- a/src/audio/sfx/sfx_intro_orb.asm +++ b/src/audio/sfx/sfx_intro_orb.asm @@ -1,112 +1,112 @@ Sfx_IntroOrb_Ch1: - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 190 - sfx_0 7, 221 - sfx_0 7, 186 - sfx_0 7, 219 - sfx_0 7, 182 - sfx_0 7, 217 - sfx_0 7, 177 - sfx_0 7, 214 - sfx_0 7, 172 - sfx_0 7, 212 - sfx_0 7, 167 - sfx_0 7, 209 - sfx_0 7, 162 - sfx_0 7, 209 - sfx_0 7, 162 - sfx_0 7, 206 - sfx_0 7, 157 - sfx_0 7, 203 - sfx_0 7, 151 - sfx_0 7, 200 - sfx_0 7, 144 - sfx_0 7, 197 - sfx_0 7, 138 - sfx_0 7, 193 - sfx_0 7, 131 - sfx_1 143 - sfx_0 7, 190 - sfx_0 7, 123 - sfx_0 7, 186 - sfx_0 7, 115 - sfx_0 7, 182 - sfx_0 7, 107 - sfx_0 7, 177 - sfx_0 7, 98 - sfx_0 7, 172 - sfx_0 7, 89 - sfx_0 7, 167 - sfx_0 7, 79 - sfx_0 7, 162 - sfx_0 7, 68 - sfx_0 7, 162 - sfx_0 7, 68 - sfx_0 7, 157 - sfx_0 7, 57 - sfx_0 7, 151 - sfx_0 7, 45 - sfx_0 7, 144 - sfx_0 7, 33 - sfx_0 7, 138 - sfx_0 7, 20 - sfx_0 7, 131 - sfx_0 7, 5 - sfx_1 79 - sfx_0 7, 123 - sfx_0 6, 246 - sfx_0 7, 115 - sfx_0 6, 231 - sfx_0 7, 107 - sfx_0 6, 214 - sfx_0 7, 98 - sfx_0 6, 196 - sfx_0 7, 89 - sfx_0 6, 178 - sfx_0 7, 79 - sfx_0 6, 158 - sfx_0 7, 68 - sfx_0 6, 137 - sfx_0 7, 68 - sfx_0 6, 137 - sfx_0 7, 57 - sfx_0 6, 114 - sfx_0 7, 45 - sfx_0 6, 91 - sfx_0 7, 33 - sfx_0 6, 66 - sfx_0 7, 20 - sfx_0 6, 40 - sfx_0 7, 5 - sfx_0 6, 11 - sfx_1 47 - sfx_0 6, 246 - sfx_0 5, 237 - sfx_0 6, 231 - sfx_0 5, 205 - sfx_0 6, 214 - sfx_0 5, 172 - sfx_0 6, 196 - sfx_0 5, 137 - sfx_0 6, 178 - sfx_0 5, 99 - sfx_0 6, 158 - sfx_0 5, 60 - sfx_0 6, 137 - sfx_0 5, 17 - sfx_0 6, 137 - sfx_0 5, 17 - sfx_0 6, 114 - sfx_0 4, 229 - sfx_0 6, 91 - sfx_0 4, 181 - sfx_0 6, 66 - sfx_0 4, 131 - sfx_0 6, 40 - sfx_0 4, 78 - sfx_0 6, 11 - sfx_0 4, 22 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 1985.94 + sfx_freq 3744.91 + sfx_freq 1872.46 + sfx_freq 3542.49 + sfx_freq 1771.24 + sfx_freq 3360.82 + sfx_freq 1659.14 + sfx_freq 3120.76 + sfx_freq 1560.38 + sfx_freq 2978.91 + sfx_freq 1472.72 + sfx_freq 2788.77 + sfx_freq 1394.38 + sfx_freq 2788.77 + sfx_freq 1394.38 + sfx_freq 2621.44 + sfx_freq 1323.96 + sfx_freq 2473.06 + sfx_freq 1248.30 + sfx_freq 2340.57 + sfx_freq 1170.29 + sfx_freq 2221.56 + sfx_freq 1110.78 + sfx_freq 2080.51 + sfx_freq 1048.58 + sfx_env 8, -7 + sfx_freq 1985.94 + sfx_freq 985.50 + sfx_freq 1872.46 + sfx_freq 929.59 + sfx_freq 1771.24 + sfx_freq 879.68 + sfx_freq 1659.14 + sfx_freq 829.57 + sfx_freq 1560.38 + sfx_freq 784.86 + sfx_freq 1472.72 + sfx_freq 740.52 + sfx_freq 1394.38 + sfx_freq 697.19 + sfx_freq 1394.38 + sfx_freq 697.19 + sfx_freq 1323.96 + sfx_freq 658.65 + sfx_freq 1248.30 + sfx_freq 621.19 + sfx_freq 1170.29 + sfx_freq 587.77 + sfx_freq 1110.78 + sfx_freq 555.39 + sfx_freq 1048.58 + sfx_freq 522.20 + sfx_env 4, -7 + sfx_freq 985.50 + sfx_freq 492.75 + sfx_freq 929.59 + sfx_freq 466.45 + sfx_freq 879.68 + sfx_freq 439.84 + sfx_freq 829.57 + sfx_freq 414.78 + sfx_freq 784.86 + sfx_freq 392.43 + sfx_freq 740.52 + sfx_freq 370.26 + sfx_freq 697.19 + sfx_freq 349.53 + sfx_freq 697.19 + sfx_freq 349.53 + sfx_freq 658.65 + sfx_freq 329.33 + sfx_freq 621.19 + sfx_freq 311.33 + sfx_freq 587.77 + sfx_freq 293.88 + sfx_freq 555.39 + sfx_freq 277.69 + sfx_freq 522.20 + sfx_freq 261.62 + sfx_env 2, -7 + sfx_freq 492.75 + sfx_freq 246.84 + sfx_freq 466.45 + sfx_freq 232.81 + sfx_freq 439.84 + sfx_freq 219.92 + sfx_freq 414.78 + sfx_freq 207.72 + sfx_freq 392.43 + sfx_freq 195.92 + sfx_freq 370.26 + sfx_freq 185.13 + sfx_freq 349.53 + sfx_freq 174.53 + sfx_freq 349.53 + sfx_freq 174.53 + sfx_freq 329.33 + sfx_freq 164.87 + sfx_freq 311.33 + sfx_freq 155.48 + sfx_freq 293.88 + sfx_freq 146.78 + sfx_freq 277.69 + sfx_freq 138.55 + sfx_freq 261.62 + sfx_freq 130.81 sfx_end diff --git a/src/audio/sfx/sfx_intro_orb_scatter.asm b/src/audio/sfx/sfx_intro_orb_scatter.asm index 09bd2c52..51d99110 100644 --- a/src/audio/sfx/sfx_intro_orb_scatter.asm +++ b/src/audio/sfx/sfx_intro_orb_scatter.asm @@ -1,84 +1,84 @@ Sfx_IntroOrbScatter_Ch1: - sfx_1 196 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_5 0 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 - sfx_0 6, 246 - sfx_6 1 - sfx_1 164 - sfx_8 17 - sfx_2 0 - sfx_0 7, 33 - sfx_6 1 - sfx_0 7, 89 - sfx_6 1 - sfx_0 7, 123 - sfx_6 1 - sfx_1 132 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_6 1 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_1 116 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 - sfx_0 6, 246 - sfx_6 1 - sfx_1 100 - sfx_8 17 - sfx_2 0 - sfx_0 7, 33 - sfx_6 1 - sfx_0 7, 89 - sfx_6 1 - sfx_0 7, 123 - sfx_6 1 - sfx_1 84 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_6 1 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 - sfx_0 6, 246 - sfx_6 1 - sfx_1 36 - sfx_8 17 - sfx_2 0 - sfx_0 7, 33 - sfx_6 1 - sfx_0 7, 89 - sfx_6 1 - sfx_0 7, 123 - sfx_6 1 - sfx_1 20 - sfx_8 17 - sfx_2 0 - sfx_0 7, 144 - sfx_6 1 - sfx_0 7, 172 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 + sfx_freq 492.75 + sfx_wait 1 + sfx_env 10, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 587.77 + sfx_wait 1 + sfx_freq 784.86 + sfx_wait 1 + sfx_freq 985.50 + sfx_wait 1 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_wait 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_env 7, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 + sfx_freq 492.75 + sfx_wait 1 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 587.77 + sfx_wait 1 + sfx_freq 784.86 + sfx_wait 1 + sfx_freq 985.50 + sfx_wait 1 + sfx_env 5, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_wait 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 + sfx_freq 492.75 + sfx_wait 1 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 587.77 + sfx_wait 1 + sfx_freq 784.86 + sfx_wait 1 + sfx_freq 985.50 + sfx_wait 1 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1170.29 + sfx_wait 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_intro_orb_swoop.asm b/src/audio/sfx/sfx_intro_orb_swoop.asm index 6d198a5e..b1d2f5d8 100644 --- a/src/audio/sfx/sfx_intro_orb_swoop.asm +++ b/src/audio/sfx/sfx_intro_orb_swoop.asm @@ -1,126 +1,126 @@ Sfx_IntroOrbSwoop_Ch1: - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 190 - sfx_0 7, 219 - sfx_0 7, 182 - sfx_0 7, 214 - sfx_0 7, 172 - sfx_0 7, 209 - sfx_0 7, 162 - sfx_0 7, 206 - sfx_0 7, 157 - sfx_0 7, 200 - sfx_0 7, 144 - sfx_0 7, 193 - sfx_0 7, 131 - sfx_1 143 - sfx_0 7, 190 - sfx_0 7, 123 - sfx_0 7, 182 - sfx_0 7, 107 - sfx_0 7, 172 - sfx_0 7, 89 - sfx_0 7, 162 - sfx_0 7, 68 - sfx_0 7, 157 - sfx_0 7, 57 - sfx_0 7, 144 - sfx_0 7, 33 - sfx_0 7, 131 - sfx_0 7, 5 - sfx_1 79 - sfx_0 7, 123 - sfx_0 6, 246 - sfx_0 7, 107 - sfx_0 6, 214 - sfx_0 7, 89 - sfx_0 6, 178 - sfx_0 7, 68 - sfx_0 6, 137 - sfx_0 7, 57 - sfx_0 6, 114 - sfx_0 7, 33 - sfx_0 6, 66 - sfx_0 7, 5 - sfx_0 6, 11 - sfx_1 47 - sfx_0 6, 246 - sfx_0 5, 237 - sfx_0 6, 214 - sfx_0 5, 172 - sfx_0 6, 178 - sfx_0 5, 99 - sfx_0 6, 137 - sfx_0 5, 17 - sfx_0 6, 114 - sfx_0 4, 229 - sfx_0 6, 66 - sfx_0 4, 131 - sfx_0 6, 11 - sfx_0 4, 22 - sfx_1 207 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 - sfx_0 6, 11 - sfx_0 4, 131 - sfx_0 6, 66 - sfx_0 4, 229 - sfx_0 6, 114 - sfx_0 5, 17 - sfx_0 6, 137 - sfx_0 5, 99 - sfx_0 6, 178 - sfx_0 5, 172 - sfx_0 6, 214 - sfx_0 5, 237 - sfx_0 6, 246 - sfx_1 143 - sfx_0 6, 11 - sfx_0 7, 5 - sfx_0 6, 66 - sfx_0 7, 33 - sfx_0 6, 114 - sfx_0 7, 57 - sfx_0 6, 137 - sfx_0 7, 68 - sfx_0 6, 178 - sfx_0 7, 89 - sfx_0 6, 214 - sfx_0 7, 107 - sfx_0 6, 246 - sfx_0 7, 123 - sfx_1 79 - sfx_0 7, 5 - sfx_0 7, 131 - sfx_0 7, 33 - sfx_0 7, 144 - sfx_0 7, 57 - sfx_0 7, 157 - sfx_0 7, 68 - sfx_0 7, 162 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 107 - sfx_0 7, 182 - sfx_0 7, 123 - sfx_0 7, 190 - sfx_1 47 - sfx_0 7, 131 - sfx_0 7, 193 - sfx_0 7, 144 - sfx_0 7, 200 - sfx_0 7, 157 - sfx_0 7, 206 - sfx_0 7, 162 - sfx_0 7, 209 - sfx_0 7, 172 - sfx_0 7, 214 - sfx_0 7, 182 - sfx_0 7, 219 - sfx_0 7, 190 - sfx_0 7, 223 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 1985.94 + sfx_freq 3542.49 + sfx_freq 1771.24 + sfx_freq 3120.76 + sfx_freq 1560.38 + sfx_freq 2788.77 + sfx_freq 1394.38 + sfx_freq 2621.44 + sfx_freq 1323.96 + sfx_freq 2340.57 + sfx_freq 1170.29 + sfx_freq 2080.51 + sfx_freq 1048.58 + sfx_env 8, -7 + sfx_freq 1985.94 + sfx_freq 985.50 + sfx_freq 1771.24 + sfx_freq 879.68 + sfx_freq 1560.38 + sfx_freq 784.86 + sfx_freq 1394.38 + sfx_freq 697.19 + sfx_freq 1323.96 + sfx_freq 658.65 + sfx_freq 1170.29 + sfx_freq 587.77 + sfx_freq 1048.58 + sfx_freq 522.20 + sfx_env 4, -7 + sfx_freq 985.50 + sfx_freq 492.75 + sfx_freq 879.68 + sfx_freq 439.84 + sfx_freq 784.86 + sfx_freq 392.43 + sfx_freq 697.19 + sfx_freq 349.53 + sfx_freq 658.65 + sfx_freq 329.33 + sfx_freq 587.77 + sfx_freq 293.88 + sfx_freq 522.20 + sfx_freq 261.62 + sfx_env 2, -7 + sfx_freq 492.75 + sfx_freq 246.84 + sfx_freq 439.84 + sfx_freq 219.92 + sfx_freq 392.43 + sfx_freq 195.92 + sfx_freq 349.53 + sfx_freq 174.53 + sfx_freq 329.33 + sfx_freq 164.87 + sfx_freq 293.88 + sfx_freq 146.78 + sfx_freq 261.62 + sfx_freq 130.81 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 + sfx_freq 261.62 + sfx_freq 146.78 + sfx_freq 293.88 + sfx_freq 164.87 + sfx_freq 329.33 + sfx_freq 174.53 + sfx_freq 349.53 + sfx_freq 195.92 + sfx_freq 392.43 + sfx_freq 219.92 + sfx_freq 439.84 + sfx_freq 246.84 + sfx_freq 492.75 + sfx_env 8, -7 + sfx_freq 261.62 + sfx_freq 522.20 + sfx_freq 293.88 + sfx_freq 587.77 + sfx_freq 329.33 + sfx_freq 658.65 + sfx_freq 349.53 + sfx_freq 697.19 + sfx_freq 392.43 + sfx_freq 784.86 + sfx_freq 439.84 + sfx_freq 879.68 + sfx_freq 492.75 + sfx_freq 985.50 + sfx_env 4, -7 + sfx_freq 522.20 + sfx_freq 1048.58 + sfx_freq 587.77 + sfx_freq 1170.29 + sfx_freq 658.65 + sfx_freq 1323.96 + sfx_freq 697.19 + sfx_freq 1394.38 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 879.68 + sfx_freq 1771.24 + sfx_freq 985.50 + sfx_freq 1985.94 + sfx_env 2, -7 + sfx_freq 1048.58 + sfx_freq 2080.51 + sfx_freq 1170.29 + sfx_freq 2340.57 + sfx_freq 1323.96 + sfx_freq 2621.44 + sfx_freq 1394.38 + sfx_freq 2788.77 + sfx_freq 1560.38 + sfx_freq 3120.76 + sfx_freq 1771.24 + sfx_freq 3542.49 + sfx_freq 1985.94 + sfx_freq 3971.88 sfx_end diff --git a/src/audio/sfx/sfx_intro_orb_title.asm b/src/audio/sfx/sfx_intro_orb_title.asm index 7b69d514..8b5052b3 100644 --- a/src/audio/sfx/sfx_intro_orb_title.asm +++ b/src/audio/sfx/sfx_intro_orb_title.asm @@ -1,100 +1,100 @@ Sfx_IntroOrbTitle_Ch1: - sfx_1 207 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 - sfx_0 6, 11 - sfx_0 4, 131 - sfx_0 6, 66 - sfx_0 4, 229 - sfx_0 6, 114 - sfx_0 5, 17 - sfx_0 6, 137 - sfx_0 5, 99 - sfx_0 6, 178 - sfx_0 5, 172 - sfx_0 6, 214 - sfx_0 5, 237 - sfx_0 6, 246 - sfx_1 143 - sfx_0 6, 11 - sfx_0 7, 5 - sfx_0 6, 66 - sfx_0 7, 33 - sfx_0 6, 114 - sfx_0 7, 57 - sfx_0 6, 137 - sfx_0 7, 68 - sfx_0 6, 178 - sfx_0 7, 89 - sfx_0 6, 214 - sfx_0 7, 107 - sfx_0 6, 246 - sfx_0 7, 123 - sfx_1 79 - sfx_0 7, 5 - sfx_0 7, 131 - sfx_0 7, 33 - sfx_0 7, 144 - sfx_0 7, 57 - sfx_0 7, 157 - sfx_0 7, 68 - sfx_0 7, 162 - sfx_0 7, 89 - sfx_0 7, 172 - sfx_0 7, 107 - sfx_0 7, 182 - sfx_0 7, 123 - sfx_0 7, 190 - sfx_1 47 - sfx_0 7, 131 - sfx_0 7, 193 - sfx_0 7, 144 - sfx_0 7, 200 - sfx_0 7, 157 - sfx_0 7, 206 - sfx_0 7, 162 - sfx_0 7, 209 - sfx_0 7, 172 - sfx_0 7, 214 - sfx_0 7, 182 - sfx_0 7, 219 - sfx_0 7, 190 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 5 - sfx_5 255 - sfx_1 47 - sfx_1 207 - sfx_8 17 - sfx_2 0 - sfx_0 6, 246 - sfx_0 7, 123 - sfx_0 7, 190 - sfx_0 7, 219 - sfx_1 143 - sfx_8 17 - sfx_2 0 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 + sfx_freq 261.62 + sfx_freq 146.78 + sfx_freq 293.88 + sfx_freq 164.87 + sfx_freq 329.33 + sfx_freq 174.53 + sfx_freq 349.53 + sfx_freq 195.92 + sfx_freq 392.43 + sfx_freq 219.92 + sfx_freq 439.84 + sfx_freq 246.84 + sfx_freq 492.75 + sfx_env 8, -7 + sfx_freq 261.62 + sfx_freq 522.20 + sfx_freq 293.88 + sfx_freq 587.77 + sfx_freq 329.33 + sfx_freq 658.65 + sfx_freq 349.53 + sfx_freq 697.19 + sfx_freq 392.43 + sfx_freq 784.86 + sfx_freq 439.84 + sfx_freq 879.68 + sfx_freq 492.75 + sfx_freq 985.50 + sfx_env 4, -7 + sfx_freq 522.20 + sfx_freq 1048.58 + sfx_freq 587.77 + sfx_freq 1170.29 + sfx_freq 658.65 + sfx_freq 1323.96 + sfx_freq 697.19 + sfx_freq 1394.38 + sfx_freq 784.86 + sfx_freq 1560.38 + sfx_freq 879.68 + sfx_freq 1771.24 + sfx_freq 985.50 + sfx_freq 1985.94 + sfx_env 2, -7 + sfx_freq 1048.58 + sfx_freq 2080.51 + sfx_freq 1170.29 + sfx_freq 2340.57 + sfx_freq 1323.96 + sfx_freq 2621.44 + sfx_freq 1394.38 + sfx_freq 2788.77 + sfx_freq 1560.38 + sfx_freq 3120.76 + sfx_freq 1771.24 + sfx_freq 3542.49 + sfx_freq 1985.94 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 5 + sfx_pitch_offset -1 + sfx_env 2, -7 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 492.75 + sfx_freq 985.50 + sfx_freq 1985.94 + sfx_freq 3542.49 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 10 - sfx_0 7, 219 + sfx_freq 3542.49 sfx_endloop - sfx_1 111 - sfx_8 17 - sfx_2 0 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 10 - sfx_0 7, 219 + sfx_freq 3542.49 sfx_endloop - sfx_1 79 + sfx_env 4, -7 sfx_loop 10 - sfx_0 7, 219 + sfx_freq 3542.49 sfx_endloop - sfx_1 47 + sfx_env 2, -7 sfx_loop 10 - sfx_0 7, 219 + sfx_freq 3542.49 sfx_endloop - sfx_1 31 + sfx_env 1, -7 sfx_loop 10 - sfx_0 7, 219 + sfx_freq 3542.49 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_leer.asm b/src/audio/sfx/sfx_leer.asm index 403606f0..488212bf 100644 --- a/src/audio/sfx/sfx_leer.asm +++ b/src/audio/sfx/sfx_leer.asm @@ -1,63 +1,63 @@ Sfx_Leer_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 4, 22 - sfx_0 4, 78 - sfx_0 4, 131 - sfx_0 4, 181 - sfx_0 4, 229 - sfx_0 4, 181 - sfx_0 4, 131 - sfx_0 4, 78 - sfx_0 4, 22 - sfx_0 4, 131 - sfx_0 4, 181 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 5, 60 - sfx_0 5, 17 - sfx_0 4, 229 - sfx_0 4, 181 - sfx_0 4, 131 - sfx_0 4, 229 - sfx_0 5, 17 - sfx_0 5, 60 - sfx_0 5, 99 - sfx_0 5, 137 - sfx_0 5, 99 - sfx_0 5, 60 - sfx_0 5, 17 - sfx_0 4, 229 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 5, 17 - sfx_0 5, 60 - sfx_0 5, 99 - sfx_0 5, 137 - sfx_0 5, 172 - sfx_0 5, 205 - sfx_0 5, 172 - sfx_0 5, 137 - sfx_0 5, 99 - sfx_0 5, 60 - sfx_0 5, 17 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 5, 99 - sfx_0 5, 137 - sfx_0 5, 172 - sfx_0 5, 205 - sfx_0 5, 237 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 6, 11 - sfx_0 6, 246 - sfx_0 6, 231 - sfx_0 6, 214 - sfx_0 6, 196 - sfx_0 6, 178 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 130.81 + sfx_freq 138.55 + sfx_freq 146.78 + sfx_freq 155.48 + sfx_freq 164.87 + sfx_freq 155.48 + sfx_freq 146.78 + sfx_freq 138.55 + sfx_freq 130.81 + sfx_freq 146.78 + sfx_freq 155.48 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 185.13 + sfx_freq 174.53 + sfx_freq 164.87 + sfx_freq 155.48 + sfx_freq 146.78 + sfx_freq 164.87 + sfx_freq 174.53 + sfx_freq 185.13 + sfx_freq 195.92 + sfx_freq 207.72 + sfx_freq 195.92 + sfx_freq 185.13 + sfx_freq 174.53 + sfx_freq 164.87 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 174.53 + sfx_freq 185.13 + sfx_freq 195.92 + sfx_freq 207.72 + sfx_freq 219.92 + sfx_freq 232.81 + sfx_freq 219.92 + sfx_freq 207.72 + sfx_freq 195.92 + sfx_freq 185.13 + sfx_freq 174.53 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 195.92 + sfx_freq 207.72 + sfx_freq 219.92 + sfx_freq 232.81 + sfx_freq 246.84 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 261.62 + sfx_freq 492.75 + sfx_freq 466.45 + sfx_freq 439.84 + sfx_freq 414.78 + sfx_freq 392.43 sfx_end diff --git a/src/audio/sfx/sfx_legendary_cards.asm b/src/audio/sfx/sfx_legendary_cards.asm index 6068fcfb..e1b6e09e 100644 --- a/src/audio/sfx/sfx_legendary_cards.asm +++ b/src/audio/sfx/sfx_legendary_cards.asm @@ -1,73 +1,73 @@ Sfx_LegendaryCards_Ch1: sfx_loop 5 - sfx_8 17 - sfx_1 55 - sfx_2 0 - sfx_0 7, 5 - sfx_0 7, 20 - sfx_0 7, 33 - sfx_0 7, 45 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 79 - sfx_8 17 - sfx_1 71 - sfx_2 0 - sfx_0 7, 89 - sfx_0 7, 98 - sfx_0 7, 107 - sfx_0 7, 115 - sfx_0 7, 123 - sfx_8 17 - sfx_1 87 - sfx_2 4 - sfx_0 7, 131 - sfx_0 7, 138 - sfx_0 7, 144 - sfx_0 7, 151 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 167 - sfx_8 17 - sfx_1 103 - sfx_2 4 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_0 7, 186 - sfx_0 7, 190 - sfx_8 17 - sfx_1 87 - sfx_2 4 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_0 7, 177 - sfx_0 7, 172 - sfx_0 7, 167 - sfx_8 17 - sfx_1 71 - sfx_2 4 - sfx_0 7, 162 - sfx_0 7, 157 - sfx_0 7, 151 - sfx_0 7, 144 - sfx_0 7, 138 - sfx_0 7, 131 - sfx_8 17 - sfx_1 55 - sfx_2 0 - sfx_0 7, 123 - sfx_0 7, 115 - sfx_0 7, 107 - sfx_0 7, 98 - sfx_0 7, 89 - sfx_0 7, 79 - sfx_0 7, 68 - sfx_0 7, 57 - sfx_0 7, 45 - sfx_0 7, 33 - sfx_0 7, 20 - sfx_0 7, 5 + sfx_pan %00010001 + sfx_env 3, 7 + sfx_duty 0 + sfx_freq 522.20 + sfx_freq 555.39 + sfx_freq 587.77 + sfx_freq 621.19 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 740.52 + sfx_pan %00010001 + sfx_env 4, 7 + sfx_duty 0 + sfx_freq 784.86 + sfx_freq 829.57 + sfx_freq 879.68 + sfx_freq 929.59 + sfx_freq 985.50 + sfx_pan %00010001 + sfx_env 5, 7 + sfx_duty 1 + sfx_freq 1048.58 + sfx_freq 1110.78 + sfx_freq 1170.29 + sfx_freq 1248.30 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1472.72 + sfx_pan %00010001 + sfx_env 6, 7 + sfx_duty 1 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_freq 1872.46 + sfx_freq 1985.94 + sfx_pan %00010001 + sfx_env 5, 7 + sfx_duty 1 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_freq 1659.14 + sfx_freq 1560.38 + sfx_freq 1472.72 + sfx_pan %00010001 + sfx_env 4, 7 + sfx_duty 1 + sfx_freq 1394.38 + sfx_freq 1323.96 + sfx_freq 1248.30 + sfx_freq 1170.29 + sfx_freq 1110.78 + sfx_freq 1048.58 + sfx_pan %00010001 + sfx_env 3, 7 + sfx_duty 0 + sfx_freq 985.50 + sfx_freq 929.59 + sfx_freq 879.68 + sfx_freq 829.57 + sfx_freq 784.86 + sfx_freq 740.52 + sfx_freq 697.19 + sfx_freq 658.65 + sfx_freq 621.19 + sfx_freq 587.77 + sfx_freq 555.39 + sfx_freq 522.20 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_lightning.asm b/src/audio/sfx/sfx_lightning.asm index 0e6fc48a..93990cd4 100644 --- a/src/audio/sfx/sfx_lightning.asm +++ b/src/audio/sfx/sfx_lightning.asm @@ -1,68 +1,68 @@ Sfx_Lightning_Ch1: - sfx_8 17 - sfx_1 240 - sfx_0 0, 98 - sfx_0 0, 96 - sfx_0 0, 98 - sfx_0 0, 96 - sfx_0 0, 98 - sfx_0 0, 96 - sfx_0 0, 98 - sfx_0 0, 96 - sfx_0 0, 98 - sfx_0 0, 96 - sfx_0 0, 98 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 128 - sfx_0 0, 98 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_1 64 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 32 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_1 16 - sfx_0 0, 21 - sfx_0 0, 21 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 23 - sfx_0 0, 23 + sfx_pan %00010001 + sfx_env 15, 0 + sfx_freq 67.22 + sfx_freq 67.15 + sfx_freq 67.22 + sfx_freq 67.15 + sfx_freq 67.22 + sfx_freq 67.15 + sfx_freq 67.22 + sfx_freq 67.15 + sfx_freq 67.22 + sfx_freq 67.15 + sfx_freq 67.22 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 8, 0 + sfx_freq 67.22 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_env 4, 0 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 2, 0 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_env 1, 0 + sfx_freq 64.66 + sfx_freq 64.66 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 64.73 + sfx_freq 64.73 sfx_end diff --git a/src/audio/sfx/sfx_lure.asm b/src/audio/sfx/sfx_lure.asm index b562ea88..503f0eb9 100644 --- a/src/audio/sfx/sfx_lure.asm +++ b/src/audio/sfx/sfx_lure.asm @@ -1,44 +1,44 @@ Sfx_Lure_Ch1: - sfx_8 17 - sfx_1 255 - sfx_2 0 - sfx_1 0 - sfx_5 0 - sfx_6 8 - sfx_5 255 - sfx_1 255 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_duty 0 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 8 + sfx_pitch_offset -1 + sfx_env 15, -7 sfx_loop 4 - sfx_0 7, 223 - sfx_5 0 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_freq 3971.88 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_endloop - sfx_8 17 - sfx_1 143 - sfx_2 0 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 sfx_loop 4 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_endloop - sfx_8 17 - sfx_1 79 - sfx_2 0 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 sfx_loop 4 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_endloop - sfx_8 17 - sfx_1 31 - sfx_2 0 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 sfx_loop 4 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_needles.asm b/src/audio/sfx/sfx_needles.asm index f636a37b..8e9b50ac 100644 --- a/src/audio/sfx/sfx_needles.asm +++ b/src/audio/sfx/sfx_needles.asm @@ -1,29 +1,29 @@ Sfx_Needles_Ch1: - sfx_8 17 - sfx_2 8 + sfx_pan %00010001 + sfx_duty 2 sfx_loop 3 - sfx_1 127 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 127 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 127 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 127 - sfx_1 0 - sfx_5 0 - sfx_6 10 - sfx_5 255 - sfx_1 127 + sfx_env 7, -7 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 7, -7 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 7, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 7, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 10 + sfx_pitch_offset -1 + sfx_env 7, -7 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_paralysis.asm b/src/audio/sfx/sfx_paralysis.asm index 3a6a3aed..8a207e8f 100644 --- a/src/audio/sfx/sfx_paralysis.asm +++ b/src/audio/sfx/sfx_paralysis.asm @@ -1,39 +1,39 @@ Sfx_Paralysis_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 0 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 7 - sfx_0 7, 162 - sfx_0 6, 137 - sfx_0 7, 172 - sfx_0 6, 178 + sfx_freq 1394.38 + sfx_freq 349.53 + sfx_freq 1560.38 + sfx_freq 392.43 sfx_endloop - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 6, 137 - sfx_0 7, 172 - sfx_0 6, 178 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 6, 137 - sfx_0 7, 172 - sfx_0 6, 178 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 6, 137 - sfx_0 7, 172 - sfx_0 6, 178 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 162 - sfx_0 6, 137 - sfx_0 7, 172 - sfx_0 6, 178 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 349.53 + sfx_freq 1560.38 + sfx_freq 392.43 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 349.53 + sfx_freq 1560.38 + sfx_freq 392.43 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 349.53 + sfx_freq 1560.38 + sfx_freq 392.43 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1394.38 + sfx_freq 349.53 + sfx_freq 1560.38 + sfx_freq 392.43 sfx_end diff --git a/src/audio/sfx/sfx_petal_dance.asm b/src/audio/sfx/sfx_petal_dance.asm index 3ec028a7..e8414923 100644 --- a/src/audio/sfx/sfx_petal_dance.asm +++ b/src/audio/sfx/sfx_petal_dance.asm @@ -1,137 +1,137 @@ Sfx_PetalDance_Ch1: - sfx_8 17 - sfx_1 255 - sfx_2 0 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 sfx_endloop - sfx_8 17 - sfx_1 239 - sfx_2 0 + sfx_pan %00010001 + sfx_env 14, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 219 - sfx_0 7, 209 - sfx_0 7, 206 - sfx_0 7, 214 + sfx_freq 3542.49 + sfx_freq 2788.77 + sfx_freq 2621.44 + sfx_freq 3120.76 sfx_endloop - sfx_8 17 - sfx_1 223 - sfx_2 0 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 214 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 209 + sfx_freq 3120.76 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2788.77 sfx_endloop - sfx_8 17 - sfx_1 207 - sfx_2 0 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 sfx_endloop - sfx_8 17 - sfx_1 191 - sfx_2 0 + sfx_pan %00010001 + sfx_env 11, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 219 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 206 + sfx_freq 3542.49 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 2621.44 sfx_endloop - sfx_8 17 - sfx_1 175 - sfx_2 0 + sfx_pan %00010001 + sfx_env 10, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 214 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 209 + sfx_freq 3120.76 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2788.77 sfx_endloop - sfx_8 17 - sfx_1 159 - sfx_2 0 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 sfx_endloop - sfx_8 17 - sfx_1 143 - sfx_2 0 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 219 - sfx_0 7, 209 - sfx_0 7, 206 - sfx_0 7, 214 + sfx_freq 3542.49 + sfx_freq 2788.77 + sfx_freq 2621.44 + sfx_freq 3120.76 sfx_endloop - sfx_8 17 - sfx_1 127 - sfx_2 0 + sfx_pan %00010001 + sfx_env 7, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 214 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 209 + sfx_freq 3120.76 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2788.77 sfx_endloop - sfx_8 17 - sfx_1 111 - sfx_2 0 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 sfx_endloop - sfx_8 17 - sfx_1 95 - sfx_2 0 + sfx_pan %00010001 + sfx_env 5, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 219 - sfx_0 7, 209 - sfx_0 7, 206 - sfx_0 7, 214 + sfx_freq 3542.49 + sfx_freq 2788.77 + sfx_freq 2621.44 + sfx_freq 3120.76 sfx_endloop - sfx_8 17 - sfx_1 79 - sfx_2 0 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 214 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 209 + sfx_freq 3120.76 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2788.77 sfx_endloop - sfx_8 17 - sfx_1 63 - sfx_2 0 + sfx_pan %00010001 + sfx_env 3, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 223 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 219 + sfx_freq 3971.88 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 3542.49 sfx_endloop - sfx_8 17 - sfx_1 47 - sfx_2 0 + sfx_pan %00010001 + sfx_env 2, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 219 - sfx_0 7, 209 - sfx_0 7, 206 - sfx_0 7, 214 + sfx_freq 3542.49 + sfx_freq 2788.77 + sfx_freq 2621.44 + sfx_freq 3120.76 sfx_endloop - sfx_8 17 - sfx_1 31 - sfx_2 0 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 214 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 209 + sfx_freq 3120.76 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2788.77 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_place_prize.asm b/src/audio/sfx/sfx_place_prize.asm index 586080a6..2dbb7033 100644 --- a/src/audio/sfx/sfx_place_prize.asm +++ b/src/audio/sfx/sfx_place_prize.asm @@ -1,25 +1,25 @@ Sfx_PlacePrize_Ch1: - sfx_8 17 - sfx_1 224 - sfx_0 0, 64 - sfx_0 0, 64 - sfx_0 0, 64 - sfx_0 0, 64 - sfx_0 0, 64 - sfx_1 128 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 64 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 32 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 20 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 + sfx_pan %00010001 + sfx_env 14, 0 + sfx_freq 66.06 + sfx_freq 66.06 + sfx_freq 66.06 + sfx_freq 66.06 + sfx_freq 66.06 + sfx_env 8, 0 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 4, 0 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 2, 0 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 1, 4 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 sfx_end diff --git a/src/audio/sfx/sfx_player_walk_map.asm b/src/audio/sfx/sfx_player_walk_map.asm index 98bf2126..8cafa504 100644 --- a/src/audio/sfx/sfx_player_walk_map.asm +++ b/src/audio/sfx/sfx_player_walk_map.asm @@ -1,25 +1,25 @@ Sfx_PlayerWalkMap_Ch1: sfx_loop 50 - sfx_1 164 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_0 6, 91 - sfx_0 6, 114 - sfx_0 5, 172 - sfx_0 5, 137 - sfx_1 100 - sfx_8 17 - sfx_2 0 - sfx_0 6, 178 - sfx_1 52 - sfx_8 17 - sfx_2 0 - sfx_0 6, 158 - sfx_1 0 - sfx_5 0 - sfx_6 10 - sfx_5 255 - sfx_1 52 + sfx_env 10, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_freq 311.33 + sfx_freq 329.33 + sfx_freq 219.92 + sfx_freq 207.72 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 392.43 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 370.26 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 10 + sfx_pitch_offset -1 + sfx_env 3, 4 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_poison.asm b/src/audio/sfx/sfx_poison.asm index 7243c1b5..af4868b6 100644 --- a/src/audio/sfx/sfx_poison.asm +++ b/src/audio/sfx/sfx_poison.asm @@ -1,38 +1,38 @@ Sfx_Poison_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 0 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 15 - sfx_0 5, 237 - sfx_0 5, 17 + sfx_freq 246.84 + sfx_freq 174.53 sfx_endloop - sfx_1 159 - sfx_8 17 - sfx_2 0 + sfx_env 9, -7 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 10 - sfx_0 5, 237 - sfx_0 5, 17 + sfx_freq 246.84 + sfx_freq 174.53 sfx_endloop - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 5, 172 - sfx_0 4, 229 - sfx_0 5, 172 - sfx_0 4, 229 - sfx_0 5, 172 - sfx_0 4, 229 - sfx_0 5, 99 - sfx_0 4, 131 - sfx_0 5, 99 - sfx_0 4, 131 - sfx_0 5, 99 - sfx_0 4, 131 - sfx_1 31 - sfx_8 17 - sfx_2 0 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 219.92 + sfx_freq 164.87 + sfx_freq 219.92 + sfx_freq 164.87 + sfx_freq 219.92 + sfx_freq 164.87 + sfx_freq 195.92 + sfx_freq 146.78 + sfx_freq 195.92 + sfx_freq 146.78 + sfx_freq 195.92 + sfx_freq 146.78 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 6 - sfx_0 5, 17 - sfx_0 4, 22 + sfx_freq 174.53 + sfx_freq 130.81 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_pokemon_dome_doors.asm b/src/audio/sfx/sfx_pokemon_dome_doors.asm index ccf4e6f6..db8d2771 100644 --- a/src/audio/sfx/sfx_pokemon_dome_doors.asm +++ b/src/audio/sfx/sfx_pokemon_dome_doors.asm @@ -1,37 +1,37 @@ Sfx_PokemonDomeDoors_Ch1: - sfx_8 17 - sfx_1 225 - sfx_0 0, 82 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_0 0, 84 - sfx_1 225 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_1 145 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_1 97 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_1 49 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_1 17 - sfx_0 0, 98 - sfx_0 0, 98 - sfx_0 0, 98 + sfx_pan %00010001 + sfx_env 14, 1 + sfx_freq 66.67 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_freq 66.74 + sfx_env 14, 1 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_env 9, 1 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_env 6, 1 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_env 3, 1 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_env 1, 1 + sfx_freq 67.22 + sfx_freq 67.22 + sfx_freq 67.22 sfx_end diff --git a/src/audio/sfx/sfx_pokemon_evolution.asm b/src/audio/sfx/sfx_pokemon_evolution.asm index a172ba38..dc931402 100644 --- a/src/audio/sfx/sfx_pokemon_evolution.asm +++ b/src/audio/sfx/sfx_pokemon_evolution.asm @@ -1,60 +1,60 @@ Sfx_PokemonEvolution_Ch1: - sfx_1 196 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 - sfx_5 0 - sfx_6 1 - sfx_0 4, 229 - sfx_6 1 - sfx_0 5, 99 - sfx_6 1 - sfx_0 6, 11 - sfx_6 1 - sfx_0 5, 99 - sfx_6 1 - sfx_0 6, 11 - sfx_6 1 - sfx_0 6, 114 - sfx_6 1 - sfx_0 6, 178 - sfx_6 1 - sfx_1 196 - sfx_2 4 - sfx_0 6, 66 - sfx_6 1 - sfx_0 6, 158 - sfx_6 1 - sfx_0 6, 214 - sfx_6 1 - sfx_0 7, 33 - sfx_6 1 - sfx_0 6, 158 - sfx_6 1 - sfx_0 7, 33 - sfx_6 1 - sfx_0 7, 79 - sfx_6 1 - sfx_0 7, 107 - sfx_6 1 - sfx_1 196 - sfx_2 0 - sfx_0 7, 57 - sfx_6 1 - sfx_0 7, 98 - sfx_6 1 - sfx_0 7, 123 - sfx_6 1 - sfx_0 7, 157 - sfx_6 1 - sfx_0 7, 98 - sfx_6 1 - sfx_0 7, 123 - sfx_6 1 - sfx_0 7, 157 - sfx_6 1 - sfx_0 7, 177 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 164.87 + sfx_wait 1 + sfx_freq 195.92 + sfx_wait 1 + sfx_freq 261.62 + sfx_wait 1 + sfx_freq 195.92 + sfx_wait 1 + sfx_freq 261.62 + sfx_wait 1 + sfx_freq 329.33 + sfx_wait 1 + sfx_freq 392.43 + sfx_wait 1 + sfx_env 12, 4 + sfx_duty 1 + sfx_freq 293.88 + sfx_wait 1 + sfx_freq 370.26 + sfx_wait 1 + sfx_freq 439.84 + sfx_wait 1 + sfx_freq 587.77 + sfx_wait 1 + sfx_freq 370.26 + sfx_wait 1 + sfx_freq 587.77 + sfx_wait 1 + sfx_freq 740.52 + sfx_wait 1 + sfx_freq 879.68 + sfx_wait 1 + sfx_env 12, 4 + sfx_duty 0 + sfx_freq 658.65 + sfx_wait 1 + sfx_freq 829.57 + sfx_wait 1 + sfx_freq 985.50 + sfx_wait 1 + sfx_freq 1323.96 + sfx_wait 1 + sfx_freq 829.57 + sfx_wait 1 + sfx_freq 985.50 + sfx_wait 1 + sfx_freq 1323.96 + sfx_wait 1 + sfx_freq 1659.14 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_pot_smash.asm b/src/audio/sfx/sfx_pot_smash.asm index a85e2bbb..0d9e92b3 100644 --- a/src/audio/sfx/sfx_pot_smash.asm +++ b/src/audio/sfx/sfx_pot_smash.asm @@ -1,97 +1,97 @@ Sfx_PotSmash_Ch1: - sfx_8 17 - sfx_1 111 - sfx_2 0 - sfx_0 7, 223 - sfx_0 7, 219 - sfx_0 7, 214 - sfx_0 7, 209 - sfx_0 7, 206 - sfx_0 7, 200 - sfx_0 7, 193 - sfx_0 7, 190 - sfx_0 7, 182 - sfx_0 7, 172 - sfx_0 7, 162 - sfx_0 7, 157 - sfx_0 7, 144 - sfx_0 7, 131 - sfx_0 7, 123 - sfx_0 7, 107 - sfx_0 7, 89 - sfx_0 7, 68 - sfx_0 7, 57 - sfx_0 7, 33 - sfx_0 7, 5 - sfx_0 6, 246 - sfx_0 6, 214 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_8 17 - sfx_1 159 - sfx_2 8 - sfx_0 7, 157 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_1 255 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 207 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 159 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 239 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 207 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 159 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 143 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 127 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 111 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 95 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 79 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 63 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 47 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 - sfx_1 31 - sfx_0 7, 190 - sfx_0 7, 186 - sfx_0 7, 182 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_freq 3542.49 + sfx_freq 3120.76 + sfx_freq 2788.77 + sfx_freq 2621.44 + sfx_freq 2340.57 + sfx_freq 2080.51 + sfx_freq 1985.94 + sfx_freq 1771.24 + sfx_freq 1560.38 + sfx_freq 1394.38 + sfx_freq 1323.96 + sfx_freq 1170.29 + sfx_freq 1048.58 + sfx_freq 985.50 + sfx_freq 879.68 + sfx_freq 784.86 + sfx_freq 697.19 + sfx_freq 658.65 + sfx_freq 587.77 + sfx_freq 522.20 + sfx_freq 492.75 + sfx_freq 439.84 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 2 + sfx_freq 1323.96 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_env 15, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 12, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 9, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 14, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 12, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 9, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 8, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 7, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 6, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 5, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 4, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 3, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 2, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 + sfx_env 1, -7 + sfx_freq 1985.94 + sfx_freq 1872.46 + sfx_freq 1771.24 sfx_end diff --git a/src/audio/sfx/sfx_powder.asm b/src/audio/sfx/sfx_powder.asm index 10aa4fe3..64c21738 100644 --- a/src/audio/sfx/sfx_powder.asm +++ b/src/audio/sfx/sfx_powder.asm @@ -1,137 +1,137 @@ Sfx_Powder_Ch1: - sfx_8 17 - sfx_1 255 - sfx_2 0 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 190 - sfx_0 7, 172 - sfx_0 7, 162 - sfx_0 7, 182 + sfx_freq 1985.94 + sfx_freq 1560.38 + sfx_freq 1394.38 + sfx_freq 1771.24 sfx_endloop - sfx_8 17 - sfx_1 239 - sfx_2 0 + sfx_pan %00010001 + sfx_env 14, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 182 - sfx_0 7, 162 - sfx_0 7, 157 - sfx_0 7, 172 + sfx_freq 1771.24 + sfx_freq 1394.38 + sfx_freq 1323.96 + sfx_freq 1560.38 sfx_endloop - sfx_8 17 - sfx_1 223 - sfx_2 0 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 172 - sfx_0 7, 157 - sfx_0 7, 144 - sfx_0 7, 162 + sfx_freq 1560.38 + sfx_freq 1323.96 + sfx_freq 1170.29 + sfx_freq 1394.38 sfx_endloop - sfx_8 17 - sfx_1 207 - sfx_2 0 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_duty 0 sfx_loop 3 - sfx_0 7, 182 - sfx_0 7, 162 - sfx_0 7, 157 - sfx_0 7, 172 + sfx_freq 1771.24 + sfx_freq 1394.38 + sfx_freq 1323.96 + sfx_freq 1560.38 sfx_endloop - sfx_8 17 - sfx_1 191 - sfx_2 0 + sfx_pan %00010001 + sfx_env 11, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 172 - sfx_0 7, 157 - sfx_0 7, 144 - sfx_0 7, 162 + sfx_freq 1560.38 + sfx_freq 1323.96 + sfx_freq 1170.29 + sfx_freq 1394.38 sfx_endloop - sfx_8 17 - sfx_1 175 - sfx_2 0 + sfx_pan %00010001 + sfx_env 10, -7 + sfx_duty 0 sfx_loop 3 - sfx_0 7, 162 - sfx_0 7, 144 - sfx_0 7, 131 - sfx_0 7, 157 + sfx_freq 1394.38 + sfx_freq 1170.29 + sfx_freq 1048.58 + sfx_freq 1323.96 sfx_endloop - sfx_8 17 - sfx_1 159 - sfx_2 0 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 172 - sfx_0 7, 157 - sfx_0 7, 144 - sfx_0 7, 162 + sfx_freq 1560.38 + sfx_freq 1323.96 + sfx_freq 1170.29 + sfx_freq 1394.38 sfx_endloop - sfx_8 17 - sfx_1 143 - sfx_2 0 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 sfx_loop 3 - sfx_0 7, 162 - sfx_0 7, 144 - sfx_0 7, 131 - sfx_0 7, 157 + sfx_freq 1394.38 + sfx_freq 1170.29 + sfx_freq 1048.58 + sfx_freq 1323.96 sfx_endloop - sfx_8 17 - sfx_1 127 - sfx_2 0 + sfx_pan %00010001 + sfx_env 7, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 157 - sfx_0 7, 131 - sfx_0 7, 123 - sfx_0 7, 144 + sfx_freq 1323.96 + sfx_freq 1048.58 + sfx_freq 985.50 + sfx_freq 1170.29 sfx_endloop - sfx_8 17 - sfx_1 111 - sfx_2 0 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_duty 0 sfx_loop 3 - sfx_0 7, 162 - sfx_0 7, 144 - sfx_0 7, 131 - sfx_0 7, 157 + sfx_freq 1394.38 + sfx_freq 1170.29 + sfx_freq 1048.58 + sfx_freq 1323.96 sfx_endloop - sfx_8 17 - sfx_1 95 - sfx_2 0 + sfx_pan %00010001 + sfx_env 5, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 157 - sfx_0 7, 131 - sfx_0 7, 123 - sfx_0 7, 144 + sfx_freq 1323.96 + sfx_freq 1048.58 + sfx_freq 985.50 + sfx_freq 1170.29 sfx_endloop - sfx_8 17 - sfx_1 79 - sfx_2 0 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 sfx_loop 3 - sfx_0 7, 144 - sfx_0 7, 123 - sfx_0 7, 107 - sfx_0 7, 131 + sfx_freq 1170.29 + sfx_freq 985.50 + sfx_freq 879.68 + sfx_freq 1048.58 sfx_endloop - sfx_8 17 - sfx_1 63 - sfx_2 0 + sfx_pan %00010001 + sfx_env 3, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 157 - sfx_0 7, 131 - sfx_0 7, 123 - sfx_0 7, 144 + sfx_freq 1323.96 + sfx_freq 1048.58 + sfx_freq 985.50 + sfx_freq 1170.29 sfx_endloop - sfx_8 17 - sfx_1 47 - sfx_2 0 + sfx_pan %00010001 + sfx_env 2, -7 + sfx_duty 0 sfx_loop 3 - sfx_0 7, 144 - sfx_0 7, 123 - sfx_0 7, 107 - sfx_0 7, 131 + sfx_freq 1170.29 + sfx_freq 985.50 + sfx_freq 879.68 + sfx_freq 1048.58 sfx_endloop - sfx_8 17 - sfx_1 31 - sfx_2 0 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 sfx_loop 2 - sfx_0 7, 131 - sfx_0 7, 107 - sfx_0 7, 89 - sfx_0 7, 123 + sfx_freq 1048.58 + sfx_freq 879.68 + sfx_freq 784.86 + sfx_freq 985.50 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_protect.asm b/src/audio/sfx/sfx_protect.asm index 172b082d..5195b550 100644 --- a/src/audio/sfx/sfx_protect.asm +++ b/src/audio/sfx/sfx_protect.asm @@ -1,111 +1,111 @@ Sfx_Protect_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 0 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 137 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 349.53 sfx_end diff --git a/src/audio/sfx/sfx_psychic.asm b/src/audio/sfx/sfx_psychic.asm index 13127cdc..ad18193a 100644 --- a/src/audio/sfx/sfx_psychic.asm +++ b/src/audio/sfx/sfx_psychic.asm @@ -1,114 +1,114 @@ Sfx_Psychic_Ch1: - sfx_1 207 - sfx_8 17 - sfx_2 8 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 2 sfx_loop 4 - sfx_0 4, 22 - sfx_0 4, 78 - sfx_0 4, 131 - sfx_0 4, 181 - sfx_0 4, 229 - sfx_0 4, 181 - sfx_0 4, 131 - sfx_0 4, 78 - sfx_0 4, 22 + sfx_freq 130.81 + sfx_freq 138.55 + sfx_freq 146.78 + sfx_freq 155.48 + sfx_freq 164.87 + sfx_freq 155.48 + sfx_freq 146.78 + sfx_freq 138.55 + sfx_freq 130.81 sfx_endloop - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_5 0 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 175 - sfx_0 7, 214 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 175 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 143 - sfx_0 7, 219 - sfx_1 111 - sfx_0 7, 219 - sfx_1 79 - sfx_0 7, 219 - sfx_1 47 - sfx_0 7, 219 - sfx_1 31 - sfx_0 7, 219 - sfx_1 207 - sfx_8 17 - sfx_2 8 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 10, -7 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 10, -7 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 8, -7 + sfx_freq 3542.49 + sfx_env 6, -7 + sfx_freq 3542.49 + sfx_env 4, -7 + sfx_freq 3542.49 + sfx_env 2, -7 + sfx_freq 3542.49 + sfx_env 1, -7 + sfx_freq 3542.49 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 2 sfx_loop 4 - sfx_0 6, 11 - sfx_0 6, 40 - sfx_0 6, 66 - sfx_0 6, 91 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 91 - sfx_0 6, 66 - sfx_0 6, 40 - sfx_0 6, 11 + sfx_freq 261.62 + sfx_freq 277.69 + sfx_freq 293.88 + sfx_freq 311.33 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 311.33 + sfx_freq 293.88 + sfx_freq 277.69 + sfx_freq 261.62 sfx_endloop - sfx_1 175 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 175 - sfx_0 7, 219 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 175 - sfx_0 7, 206 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 175 - sfx_0 7, 223 - sfx_6 1 - sfx_1 143 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_1 111 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_1 79 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_1 47 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_1 31 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 10, -7 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 10, -7 + sfx_freq 2621.44 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 10, -7 + sfx_freq 3971.88 + sfx_wait 1 + sfx_env 8, -7 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_env 6, -7 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_env 4, -7 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_env 2, -7 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_env 1, -7 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_punch.asm b/src/audio/sfx/sfx_punch.asm index 37163c2a..db02aa94 100644 --- a/src/audio/sfx/sfx_punch.asm +++ b/src/audio/sfx/sfx_punch.asm @@ -1,92 +1,92 @@ Sfx_Punch_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 143 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 15 - sfx_5 255 - sfx_1 31 - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 143 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 15 - sfx_5 255 - sfx_1 31 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 15 + sfx_pitch_offset -1 + sfx_env 1, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 15 + sfx_pitch_offset -1 + sfx_env 1, -7 sfx_end diff --git a/src/audio/sfx/sfx_question_mark.asm b/src/audio/sfx/sfx_question_mark.asm index 56248f3a..2a20eabe 100644 --- a/src/audio/sfx/sfx_question_mark.asm +++ b/src/audio/sfx/sfx_question_mark.asm @@ -1,162 +1,162 @@ Sfx_QuestionMark_Ch1: - sfx_1 239 - sfx_8 17 - sfx_2 8 - sfx_0 7, 190 - sfx_5 0 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 162 - sfx_6 1 - sfx_1 175 - sfx_8 17 - sfx_2 8 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 209 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 206 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 111 - sfx_8 17 - sfx_2 8 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 209 - sfx_6 1 - sfx_0 7, 193 - sfx_6 1 - sfx_0 7, 206 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 182 - sfx_6 1 - sfx_0 7, 193 - sfx_6 1 - sfx_0 7, 172 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 20 - sfx_5 0 - sfx_1 47 + sfx_env 14, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1985.94 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 10, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 2788.77 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 2621.44 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 2788.77 + sfx_wait 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_freq 2621.44 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 1771.24 + sfx_wait 1 + sfx_freq 2080.51 + sfx_wait 1 + sfx_freq 1560.38 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 20 + sfx_pitch_offset 0 + sfx_env 2, -7 sfx_loop 3 - sfx_1 231 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 - sfx_1 231 - sfx_8 17 - sfx_2 8 - sfx_0 7, 190 - sfx_6 1 - sfx_1 135 - sfx_8 17 - sfx_2 8 - sfx_0 7, 190 - sfx_6 1 - sfx_1 119 - sfx_8 17 - sfx_2 8 - sfx_0 7, 182 - sfx_6 1 - sfx_1 103 - sfx_8 17 - sfx_2 8 - sfx_0 7, 172 - sfx_6 1 - sfx_1 81 - sfx_8 17 - sfx_2 8 - sfx_0 7, 162 - sfx_6 1 - sfx_1 65 - sfx_8 17 - sfx_2 8 - sfx_0 7, 162 - sfx_6 1 - sfx_1 49 - sfx_8 17 - sfx_2 8 - sfx_0 7, 162 - sfx_6 1 - sfx_1 33 - sfx_8 17 - sfx_2 8 - sfx_0 7, 162 - sfx_6 1 - sfx_1 17 - sfx_8 17 - sfx_2 8 - sfx_0 7, 162 - sfx_6 1 - sfx_1 1 - sfx_8 17 - sfx_2 8 - sfx_0 7, 162 - sfx_6 1 + sfx_env 14, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 + sfx_env 14, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1985.94 + sfx_wait 1 + sfx_env 8, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1985.94 + sfx_wait 1 + sfx_env 7, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1771.24 + sfx_wait 1 + sfx_env 6, 7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1560.38 + sfx_wait 1 + sfx_env 5, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 4, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 3, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 2, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 1, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1394.38 + sfx_wait 1 + sfx_env 0, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1394.38 + sfx_wait 1 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_receive_card_pop.asm b/src/audio/sfx/sfx_receive_card_pop.asm index 97e49547..a9e62d13 100644 --- a/src/audio/sfx/sfx_receive_card_pop.asm +++ b/src/audio/sfx/sfx_receive_card_pop.asm @@ -1,146 +1,146 @@ Sfx_ReceiveCardPop_Ch1: - sfx_1 0 - sfx_5 0 - sfx_6 6 - sfx_5 255 - sfx_1 1 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_5 0 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 68 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 52 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 36 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_1 20 - sfx_8 17 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 6 + sfx_pitch_offset -1 + sfx_env 0, 1 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 3, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_end Sfx_ReceiveCardPop_Ch2: - sfx_1 196 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_1 132 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_1 116 - sfx_8 17 - sfx_2 8 - sfx_0 7, 68 - sfx_1 100 - sfx_8 17 - sfx_2 8 - sfx_0 7, 57 - sfx_1 68 - sfx_8 17 - sfx_2 8 - sfx_0 7, 33 - sfx_1 36 - sfx_8 17 - sfx_2 8 - sfx_0 7, 5 - sfx_1 20 - sfx_8 17 - sfx_2 8 - sfx_0 6, 246 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_env 7, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 697.19 + sfx_env 6, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 658.65 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 587.77 + sfx_env 2, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 522.20 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 492.75 sfx_end Sfx_ReceiveCardPop_Ch3: - sfx_1 119 - sfx_8 17 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 + sfx_env 7, 7 + sfx_pan %00010001 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 sfx_end diff --git a/src/audio/sfx/sfx_rock_throw.asm b/src/audio/sfx/sfx_rock_throw.asm index 0090fd8d..601631db 100644 --- a/src/audio/sfx/sfx_rock_throw.asm +++ b/src/audio/sfx/sfx_rock_throw.asm @@ -1,27 +1,27 @@ Sfx_RockThrow_Ch1: - sfx_8 17 - sfx_1 223 + sfx_pan %00010001 + sfx_env 13, -7 sfx_loop 40 - sfx_0 0, 112 - sfx_0 0, 114 + sfx_freq 67.70 + sfx_freq 67.77 sfx_endloop - sfx_1 143 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_1 79 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_1 31 - sfx_0 0, 112 - sfx_0 0, 114 + sfx_env 8, -7 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_env 4, -7 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_env 1, -7 + sfx_freq 67.70 + sfx_freq 67.77 sfx_end diff --git a/src/audio/sfx/sfx_save_game.asm b/src/audio/sfx/sfx_save_game.asm index 6f1c9142..6902831c 100644 --- a/src/audio/sfx/sfx_save_game.asm +++ b/src/audio/sfx/sfx_save_game.asm @@ -1,66 +1,66 @@ Sfx_SaveGame_Ch1: - sfx_1 247 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_5 0 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 215 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 199 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 135 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 71 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 39 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 - sfx_1 23 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 214 - sfx_6 1 + sfx_env 15, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 13, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 12, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 8, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 4, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 2, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 + sfx_env 1, 7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3120.76 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_seismic_toss.asm b/src/audio/sfx/sfx_seismic_toss.asm index c5681a35..352e0c4e 100644 --- a/src/audio/sfx/sfx_seismic_toss.asm +++ b/src/audio/sfx/sfx_seismic_toss.asm @@ -1,122 +1,122 @@ Sfx_SeismicToss_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 5, 237 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 5, 205 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 5, 172 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 5, 137 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 5, 99 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 5, 60 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 5, 17 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 4, 229 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 4, 181 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 4, 131 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 4, 78 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_0 4, 22 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 246.84 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 232.81 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 219.92 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 207.72 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 195.92 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 185.13 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 174.53 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 164.87 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 155.48 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 146.78 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 138.55 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_freq 130.81 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 sfx_end Sfx_SeismicToss_Ch2: - sfx_8 17 - sfx_1 223 - sfx_1 0 - sfx_5 0 - sfx_6 18 - sfx_5 255 - sfx_1 223 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 143 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 79 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 47 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 18 + sfx_pitch_offset -1 + sfx_env 13, -7 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 8, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 4, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 2, -7 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 sfx_end diff --git a/src/audio/sfx/sfx_selfdestruct.asm b/src/audio/sfx/sfx_selfdestruct.asm index 70fec6e6..221f40be 100644 --- a/src/audio/sfx/sfx_selfdestruct.asm +++ b/src/audio/sfx/sfx_selfdestruct.asm @@ -1,43 +1,43 @@ Sfx_Selfdestruct_Ch1: - sfx_8 17 - sfx_1 207 - sfx_0 0, 113 - sfx_0 0, 113 - sfx_0 0, 113 - sfx_0 0, 113 - sfx_1 255 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 207 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 143 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 79 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 31 - sfx_0 0, 81 - sfx_0 0, 81 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_freq 67.74 + sfx_freq 67.74 + sfx_freq 67.74 + sfx_freq 67.74 + sfx_env 15, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 12, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 8, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 4, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 1, -7 + sfx_freq 66.64 + sfx_freq 66.64 sfx_end diff --git a/src/audio/sfx/sfx_sing.asm b/src/audio/sfx/sfx_sing.asm index 5bb11850..04a00d99 100644 --- a/src/audio/sfx/sfx_sing.asm +++ b/src/audio/sfx/sfx_sing.asm @@ -1,29 +1,29 @@ Sfx_Sing_Ch1: - sfx_1 207 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_5 0 - sfx_6 15 - sfx_0 7, 5 - sfx_6 15 - sfx_0 7, 123 - sfx_6 15 - sfx_0 7, 89 - sfx_6 15 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_6 7 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_6 7 - sfx_1 47 - sfx_8 17 - sfx_2 8 - sfx_0 7, 89 - sfx_6 7 + sfx_env 12, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_pitch_offset 0 + sfx_wait 15 + sfx_freq 522.20 + sfx_wait 15 + sfx_freq 985.50 + sfx_wait 15 + sfx_freq 784.86 + sfx_wait 15 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_wait 7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_wait 7 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 784.86 + sfx_wait 7 sfx_end diff --git a/src/audio/sfx/sfx_single_hit.asm b/src/audio/sfx/sfx_single_hit.asm index ec3f2bcf..e204a7a2 100644 --- a/src/audio/sfx/sfx_single_hit.asm +++ b/src/audio/sfx/sfx_single_hit.asm @@ -1,33 +1,33 @@ Sfx_SingleHit_Ch1: - sfx_8 17 - sfx_1 241 - sfx_0 0, 45 - sfx_0 0, 45 - sfx_0 0, 77 - sfx_0 0, 77 - sfx_1 193 - sfx_0 0, 71 - sfx_0 0, 23 - sfx_0 0, 69 - sfx_0 0, 21 - sfx_1 129 - sfx_0 0, 69 - sfx_0 0, 21 - sfx_0 0, 68 - sfx_0 0, 20 - sfx_1 97 - sfx_0 0, 20 - sfx_0 0, 20 - sfx_0 0, 19 - sfx_0 0, 19 - sfx_1 65 - sfx_0 0, 19 - sfx_0 0, 19 - sfx_0 0, 19 - sfx_0 0, 19 - sfx_1 33 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 + sfx_pan %00010001 + sfx_env 15, 1 + sfx_freq 65.44 + sfx_freq 65.44 + sfx_freq 66.50 + sfx_freq 66.50 + sfx_env 12, 1 + sfx_freq 66.30 + sfx_freq 64.73 + sfx_freq 66.23 + sfx_freq 64.66 + sfx_env 8, 1 + sfx_freq 66.23 + sfx_freq 64.66 + sfx_freq 66.20 + sfx_freq 64.63 + sfx_env 6, 1 + sfx_freq 64.63 + sfx_freq 64.63 + sfx_freq 64.60 + sfx_freq 64.60 + sfx_env 4, 1 + sfx_freq 64.60 + sfx_freq 64.60 + sfx_freq 64.60 + sfx_freq 64.60 + sfx_env 2, 1 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 sfx_end diff --git a/src/audio/sfx/sfx_slash.asm b/src/audio/sfx/sfx_slash.asm index ae325541..878c265f 100644 --- a/src/audio/sfx/sfx_slash.asm +++ b/src/audio/sfx/sfx_slash.asm @@ -1,38 +1,38 @@ Sfx_Slash_Ch1: - sfx_8 17 - sfx_1 223 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 255 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_1 223 - sfx_0 0, 33 - sfx_0 0, 50 - sfx_1 143 - sfx_0 0, 33 - sfx_0 0, 50 - sfx_0 0, 34 - sfx_0 0, 51 - sfx_0 0, 34 - sfx_0 0, 51 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_1 79 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_0 0, 35 - sfx_0 0, 52 - sfx_1 31 - sfx_0 0, 36 - sfx_0 0, 53 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 15, -7 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_env 13, -7 + sfx_freq 65.05 + sfx_freq 65.60 + sfx_env 8, -7 + sfx_freq 65.05 + sfx_freq 65.60 + sfx_freq 65.08 + sfx_freq 65.63 + sfx_freq 65.08 + sfx_freq 65.63 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_env 4, -7 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_freq 65.11 + sfx_freq 65.67 + sfx_env 1, -7 + sfx_freq 65.15 + sfx_freq 65.70 sfx_end diff --git a/src/audio/sfx/sfx_sleep.asm b/src/audio/sfx/sfx_sleep.asm index 2843dbb6..70357d82 100644 --- a/src/audio/sfx/sfx_sleep.asm +++ b/src/audio/sfx/sfx_sleep.asm @@ -1,138 +1,138 @@ Sfx_Sleep_Ch1: - sfx_1 228 - sfx_8 17 - sfx_2 0 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 172 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 162 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 157 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_0 7, 144 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 228 - sfx_1 228 - sfx_8 17 - sfx_2 0 - sfx_0 7, 89 - sfx_5 0 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 7, 68 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 7, 57 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 7, 33 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 7, 5 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_1 228 - sfx_8 17 - sfx_2 0 - sfx_0 6, 66 - sfx_6 1 - sfx_0 6, 11 - sfx_6 1 - sfx_0 6, 114 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 6, 11 - sfx_6 1 - sfx_0 6, 246 - sfx_6 1 - sfx_0 6, 66 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 5, 237 - sfx_6 1 - sfx_0 5, 172 - sfx_6 1 - sfx_0 6, 11 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 5, 172 - sfx_6 1 - sfx_0 5, 99 - sfx_6 1 - sfx_0 5, 237 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 - sfx_0 5, 99 - sfx_6 1 - sfx_0 5, 17 - sfx_6 1 - sfx_0 5, 172 - sfx_6 1 - sfx_1 0 - sfx_5 0 - sfx_6 2 - sfx_5 0 - sfx_1 228 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1560.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1394.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1323.96 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_freq 1170.29 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 14, 4 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 784.86 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 697.19 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 658.65 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 587.77 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 522.20 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_env 14, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 293.88 + sfx_wait 1 + sfx_freq 261.62 + sfx_wait 1 + sfx_freq 329.33 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 261.62 + sfx_wait 1 + sfx_freq 492.75 + sfx_wait 1 + sfx_freq 293.88 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 246.84 + sfx_wait 1 + sfx_freq 219.92 + sfx_wait 1 + sfx_freq 261.62 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 219.92 + sfx_wait 1 + sfx_freq 195.92 + sfx_wait 1 + sfx_freq 246.84 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 + sfx_freq 195.92 + sfx_wait 1 + sfx_freq 174.53 + sfx_wait 1 + sfx_freq 219.92 + sfx_wait 1 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 2 + sfx_pitch_offset 0 + sfx_env 14, 4 sfx_end diff --git a/src/audio/sfx/sfx_small_flame.asm b/src/audio/sfx/sfx_small_flame.asm index 8dae94ea..5c0f590c 100644 --- a/src/audio/sfx/sfx_small_flame.asm +++ b/src/audio/sfx/sfx_small_flame.asm @@ -1,97 +1,97 @@ Sfx_SmallFlame_Ch1: - sfx_8 17 - sfx_1 111 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_0 0, 84 - sfx_0 0, 83 - sfx_0 0, 85 - sfx_1 246 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 134 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 102 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 70 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 38 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_1 22 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 - sfx_0 0, 68 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_freq 66.74 + sfx_freq 66.70 + sfx_freq 66.77 + sfx_env 15, 6 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 8, 6 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 6, 6 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 4, 6 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 2, 6 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_env 1, 6 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 + sfx_freq 66.20 sfx_end diff --git a/src/audio/sfx/sfx_sonicboom.asm b/src/audio/sfx/sfx_sonicboom.asm index 59cf1d82..12848380 100644 --- a/src/audio/sfx/sfx_sonicboom.asm +++ b/src/audio/sfx/sfx_sonicboom.asm @@ -1,54 +1,54 @@ Sfx_Sonicboom_Ch1: - sfx_8 17 - sfx_1 223 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 255 - sfx_0 0, 37 - sfx_0 0, 53 - sfx_0 0, 37 - sfx_0 0, 53 - sfx_0 0, 37 - sfx_0 0, 53 - sfx_0 0, 53 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_0 0, 51 - sfx_0 0, 51 - sfx_0 0, 51 - sfx_0 0, 51 - sfx_0 0, 51 + sfx_pan %00010001 + sfx_env 13, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 15, -7 + sfx_freq 65.18 + sfx_freq 65.70 + sfx_freq 65.18 + sfx_freq 65.70 + sfx_freq 65.18 + sfx_freq 65.70 + sfx_freq 65.70 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_freq 65.63 + sfx_freq 65.63 + sfx_freq 65.63 + sfx_freq 65.63 + sfx_freq 65.63 sfx_loop 5 - sfx_0 0, 49 - sfx_0 0, 34 - sfx_0 0, 50 + sfx_freq 65.57 + sfx_freq 65.08 + sfx_freq 65.60 sfx_endloop - sfx_1 223 - sfx_0 0, 34 - sfx_0 0, 50 - sfx_1 143 - sfx_0 0, 34 - sfx_0 0, 50 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_1 79 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_0 0, 33 - sfx_0 0, 49 - sfx_1 31 - sfx_0 0, 33 - sfx_0 0, 49 + sfx_env 13, -7 + sfx_freq 65.08 + sfx_freq 65.60 + sfx_env 8, -7 + sfx_freq 65.08 + sfx_freq 65.60 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_env 4, -7 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_freq 65.05 + sfx_freq 65.57 + sfx_env 1, -7 + sfx_freq 65.05 + sfx_freq 65.57 sfx_end diff --git a/src/audio/sfx/sfx_speed.asm b/src/audio/sfx/sfx_speed.asm index 796d70f5..5b5574e9 100644 --- a/src/audio/sfx/sfx_speed.asm +++ b/src/audio/sfx/sfx_speed.asm @@ -1,46 +1,46 @@ Sfx_Speed_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 31 - sfx_0 0, 33 - sfx_1 47 - sfx_0 0, 33 - sfx_1 79 - sfx_0 0, 33 - sfx_1 111 - sfx_0 0, 33 - sfx_1 143 - sfx_0 0, 33 - sfx_1 239 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 143 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 111 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 79 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 47 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 31 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 + sfx_env 1, -7 + sfx_freq 65.05 + sfx_env 2, -7 + sfx_freq 65.05 + sfx_env 4, -7 + sfx_freq 65.05 + sfx_env 6, -7 + sfx_freq 65.05 + sfx_env 8, -7 + sfx_freq 65.05 + sfx_env 14, -7 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 8, -7 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 6, -7 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 4, -7 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 2, -7 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 1, -7 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_stone_barrage.asm b/src/audio/sfx/sfx_stone_barrage.asm index db2c8a2e..4da1e2b7 100644 --- a/src/audio/sfx/sfx_stone_barrage.asm +++ b/src/audio/sfx/sfx_stone_barrage.asm @@ -1,49 +1,49 @@ Sfx_StoneBarrage_Ch1: - sfx_8 17 - sfx_1 223 + sfx_pan %00010001 + sfx_env 13, -7 sfx_loop 4 - sfx_0 0, 80 - sfx_0 0, 82 - sfx_0 0, 80 - sfx_0 0, 82 - sfx_0 0, 80 - sfx_0 0, 82 - sfx_0 0, 80 - sfx_0 0, 82 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 + sfx_freq 66.60 + sfx_freq 66.67 + sfx_freq 66.60 + sfx_freq 66.67 + sfx_freq 66.60 + sfx_freq 66.67 + sfx_freq 66.60 + sfx_freq 66.67 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 sfx_endloop - sfx_1 143 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_1 79 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_1 31 - sfx_0 0, 112 - sfx_0 0, 114 - sfx_0 0, 112 - sfx_0 0, 114 + sfx_env 8, -7 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_env 4, -7 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_env 1, -7 + sfx_freq 67.70 + sfx_freq 67.77 + sfx_freq 67.70 + sfx_freq 67.77 sfx_end diff --git a/src/audio/sfx/sfx_stretch_kick.asm b/src/audio/sfx/sfx_stretch_kick.asm index cd203b66..12228089 100644 --- a/src/audio/sfx/sfx_stretch_kick.asm +++ b/src/audio/sfx/sfx_stretch_kick.asm @@ -1,34 +1,34 @@ Sfx_StretchKick_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 214 - sfx_0 6, 246 - sfx_0 7, 5 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 123 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 144 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 157 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 439.84 + sfx_freq 492.75 + sfx_freq 522.20 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 985.50 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1170.29 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1323.96 sfx_end diff --git a/src/audio/sfx/sfx_string_shot.asm b/src/audio/sfx/sfx_string_shot.asm index de69ed86..263fac51 100644 --- a/src/audio/sfx/sfx_string_shot.asm +++ b/src/audio/sfx/sfx_string_shot.asm @@ -1,138 +1,138 @@ Sfx_StringShot_Ch1: - sfx_8 17 - sfx_1 159 - sfx_2 0 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 172 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 162 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 157 - sfx_1 0 - sfx_5 0 - sfx_6 22 - sfx_5 255 - sfx_1 159 - sfx_8 17 - sfx_1 159 - sfx_2 0 - sfx_0 7, 206 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 200 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 193 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 190 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 182 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 172 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 162 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 157 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 0 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1560.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1394.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1323.96 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 22 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 0 + sfx_freq 2621.44 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 2340.57 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 2080.51 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1985.94 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1771.24 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1560.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1394.38 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 1323.96 sfx_end Sfx_StringShot_Ch2: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 207 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 127 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 95 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 47 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 0 - sfx_5 0 - sfx_6 10 - sfx_5 255 - sfx_1 47 + sfx_env 12, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 7, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 5, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 2, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 10 + sfx_pitch_offset -1 + sfx_env 2, -7 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_supersonic.asm b/src/audio/sfx/sfx_supersonic.asm index bfd61769..22463ca4 100644 --- a/src/audio/sfx/sfx_supersonic.asm +++ b/src/audio/sfx/sfx_supersonic.asm @@ -1,12 +1,12 @@ Sfx_Supersonic_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 20 - sfx_1 193 - sfx_0 0, 15 - sfx_0 0, 45 - sfx_0 0, 15 - sfx_0 0, 45 - sfx_0 0, 15 - sfx_0 0, 45 + sfx_env 12, 1 + sfx_freq 64.47 + sfx_freq 65.44 + sfx_freq 64.47 + sfx_freq 65.44 + sfx_freq 64.47 + sfx_freq 65.44 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_thunder_shock.asm b/src/audio/sfx/sfx_thunder_shock.asm index 09755db3..89910b25 100644 --- a/src/audio/sfx/sfx_thunder_shock.asm +++ b/src/audio/sfx/sfx_thunder_shock.asm @@ -1,53 +1,53 @@ Sfx_ThunderShock_Ch1: - sfx_8 17 - sfx_1 192 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_1 128 - sfx_0 0, 64 - sfx_0 0, 65 - sfx_0 0, 64 - sfx_0 0, 64 - sfx_0 0, 65 - sfx_0 0, 64 - sfx_0 0, 65 - sfx_0 0, 64 - sfx_1 64 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 66 - sfx_0 0, 65 - sfx_1 32 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_0 0, 50 - sfx_0 0, 49 - sfx_0 0, 50 - sfx_0 0, 49 - sfx_1 20 - sfx_0 0, 50 - sfx_0 0, 50 - sfx_0 0, 51 - sfx_0 0, 50 - sfx_0 0, 51 - sfx_0 0, 50 + sfx_pan %00010001 + sfx_env 12, 0 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_env 8, 0 + sfx_freq 66.06 + sfx_freq 66.10 + sfx_freq 66.06 + sfx_freq 66.06 + sfx_freq 66.10 + sfx_freq 66.06 + sfx_freq 66.10 + sfx_freq 66.06 + sfx_env 4, 0 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.13 + sfx_freq 66.10 + sfx_env 2, 0 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_freq 65.60 + sfx_freq 65.57 + sfx_freq 65.60 + sfx_freq 65.57 + sfx_env 1, 4 + sfx_freq 65.60 + sfx_freq 65.60 + sfx_freq 65.63 + sfx_freq 65.60 + sfx_freq 65.63 + sfx_freq 65.60 sfx_end diff --git a/src/audio/sfx/sfx_thunder_wave.asm b/src/audio/sfx/sfx_thunder_wave.asm index 651e7f7c..bd3240bd 100644 --- a/src/audio/sfx/sfx_thunder_wave.asm +++ b/src/audio/sfx/sfx_thunder_wave.asm @@ -1,135 +1,135 @@ Sfx_ThunderWave_Ch1: - sfx_1 159 - sfx_8 17 - sfx_2 0 + sfx_env 9, -7 + sfx_pan %00010001 + sfx_duty 0 sfx_loop 6 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 159 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 9, -7 sfx_endloop - sfx_1 111 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 111 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 63 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 63 - sfx_1 47 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 47 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 223 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 31 + sfx_env 6, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 6, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 3, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 3, -7 + sfx_env 2, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 2, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 3971.88 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 1, -7 sfx_end Sfx_ThunderWave_Ch2: - sfx_1 207 - sfx_8 17 + sfx_env 12, -7 + sfx_pan %00010001 sfx_loop 3 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_0 0, 2 - sfx_0 0, 1 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_freq 64.06 + sfx_freq 64.03 sfx_endloop - sfx_1 159 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_1 111 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_1 79 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_1 47 - sfx_0 0, 2 - sfx_0 0, 1 - sfx_1 31 - sfx_0 0, 2 - sfx_0 0, 1 + sfx_env 9, -7 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_env 6, -7 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_env 4, -7 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_env 2, -7 + sfx_freq 64.06 + sfx_freq 64.03 + sfx_env 1, -7 + sfx_freq 64.06 + sfx_freq 64.03 sfx_end diff --git a/src/audio/sfx/sfx_thunderpunch.asm b/src/audio/sfx/sfx_thunderpunch.asm index 32c01eb4..736a45af 100644 --- a/src/audio/sfx/sfx_thunderpunch.asm +++ b/src/audio/sfx/sfx_thunderpunch.asm @@ -1,142 +1,142 @@ Sfx_Thunderpunch_Ch1: - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 255 - sfx_8 17 - sfx_2 8 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 143 - sfx_8 17 - sfx_2 8 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 143 - sfx_1 79 - sfx_8 17 - sfx_2 8 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 31 - sfx_8 17 - sfx_2 8 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 35 - sfx_5 255 - sfx_1 31 - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 57 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 255 - sfx_8 17 - sfx_2 0 - sfx_0 7, 33 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 255 - sfx_1 143 - sfx_8 17 - sfx_2 0 - sfx_0 7, 5 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 143 - sfx_1 79 - sfx_8 17 - sfx_2 0 - sfx_0 7, 123 - sfx_1 0 - sfx_5 0 - sfx_6 1 - sfx_5 255 - sfx_1 79 - sfx_1 31 - sfx_8 17 - sfx_2 0 - sfx_0 7, 107 - sfx_1 0 - sfx_5 0 - sfx_6 35 - sfx_5 255 - sfx_1 31 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 35 + sfx_pitch_offset -1 + sfx_env 1, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 658.65 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 15, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 587.77 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 15, -7 + sfx_env 8, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 522.20 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 8, -7 + sfx_env 4, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 985.50 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_pitch_offset -1 + sfx_env 4, -7 + sfx_env 1, -7 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 879.68 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 35 + sfx_pitch_offset -1 + sfx_env 1, -7 sfx_end Sfx_Thunderpunch_Ch2: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 0 - sfx_5 0 - sfx_6 10 - sfx_5 255 - sfx_1 1 - sfx_1 223 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_0 0, 55 - sfx_0 0, 48 - sfx_1 143 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_1 79 - sfx_0 0, 66 - sfx_0 0, 67 - sfx_0 0, 130 - sfx_0 0, 131 - sfx_0 0, 130 - sfx_0 0, 131 - sfx_1 31 - sfx_0 0, 130 - sfx_0 0, 131 - sfx_0 0, 130 - sfx_0 0, 131 - sfx_0 0, 130 - sfx_0 0, 131 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 10 + sfx_pitch_offset -1 + sfx_env 0, 1 + sfx_env 13, -7 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_freq 65.77 + sfx_freq 65.54 + sfx_env 8, -7 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_env 4, -7 + sfx_freq 66.13 + sfx_freq 66.16 + sfx_freq 68.34 + sfx_freq 68.37 + sfx_freq 68.34 + sfx_freq 68.37 + sfx_env 1, -7 + sfx_freq 68.34 + sfx_freq 68.37 + sfx_freq 68.34 + sfx_freq 68.37 + sfx_freq 68.34 + sfx_freq 68.37 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_toxic.asm b/src/audio/sfx/sfx_toxic.asm index 2d1fc2d1..787161d2 100644 --- a/src/audio/sfx/sfx_toxic.asm +++ b/src/audio/sfx/sfx_toxic.asm @@ -1,65 +1,65 @@ Sfx_Toxic_Ch1: sfx_loop 4 - sfx_1 244 - sfx_8 17 - sfx_2 0 - sfx_0 5, 237 - sfx_0 4, 22 - sfx_0 5, 172 - sfx_0 4, 22 - sfx_0 5, 99 - sfx_0 4, 22 - sfx_0 5, 17 - sfx_0 4, 22 - sfx_0 4, 229 - sfx_0 4, 22 - sfx_0 4, 131 - sfx_0 4, 22 - sfx_1 244 - sfx_8 17 - sfx_2 4 - sfx_0 5, 237 - sfx_0 4, 22 - sfx_0 5, 172 - sfx_0 4, 22 - sfx_0 5, 99 - sfx_0 4, 22 - sfx_0 5, 17 - sfx_0 4, 22 - sfx_0 4, 229 - sfx_0 4, 22 - sfx_0 4, 131 - sfx_0 4, 22 - sfx_1 244 - sfx_8 17 - sfx_2 8 - sfx_0 5, 237 - sfx_0 4, 22 - sfx_0 5, 172 - sfx_0 4, 22 - sfx_0 5, 99 - sfx_0 4, 22 - sfx_0 5, 17 - sfx_0 4, 22 - sfx_0 4, 229 - sfx_0 4, 22 - sfx_0 4, 131 - sfx_0 4, 22 + sfx_env 15, 4 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 246.84 + sfx_freq 130.81 + sfx_freq 219.92 + sfx_freq 130.81 + sfx_freq 195.92 + sfx_freq 130.81 + sfx_freq 174.53 + sfx_freq 130.81 + sfx_freq 164.87 + sfx_freq 130.81 + sfx_freq 146.78 + sfx_freq 130.81 + sfx_env 15, 4 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 246.84 + sfx_freq 130.81 + sfx_freq 219.92 + sfx_freq 130.81 + sfx_freq 195.92 + sfx_freq 130.81 + sfx_freq 174.53 + sfx_freq 130.81 + sfx_freq 164.87 + sfx_freq 130.81 + sfx_freq 146.78 + sfx_freq 130.81 + sfx_env 15, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 246.84 + sfx_freq 130.81 + sfx_freq 219.92 + sfx_freq 130.81 + sfx_freq 195.92 + sfx_freq 130.81 + sfx_freq 174.53 + sfx_freq 130.81 + sfx_freq 164.87 + sfx_freq 130.81 + sfx_freq 146.78 + sfx_freq 130.81 sfx_endloop - sfx_1 196 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 - sfx_1 132 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 - sfx_1 68 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 - sfx_1 20 - sfx_8 17 - sfx_2 8 - sfx_0 4, 22 + sfx_env 12, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 + sfx_env 8, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 + sfx_env 4, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 + sfx_env 1, 4 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 130.81 sfx_end diff --git a/src/audio/sfx/sfx_unused_05.asm b/src/audio/sfx/sfx_unused_05.asm index c3083cf4..633db23c 100644 --- a/src/audio/sfx/sfx_unused_05.asm +++ b/src/audio/sfx/sfx_unused_05.asm @@ -1,74 +1,74 @@ Sfx_Unused05_Ch1: - sfx_1 241 - sfx_8 17 - sfx_2 8 - sfx_0 7, 5 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_1 241 - sfx_8 17 - sfx_2 8 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_1 241 - sfx_8 17 - sfx_2 8 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_1 129 - sfx_8 17 - sfx_2 4 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_1 129 - sfx_8 17 - sfx_2 4 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_1 129 - sfx_8 17 - sfx_2 4 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 49 - sfx_8 17 - sfx_2 0 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 123 - sfx_1 49 - sfx_8 17 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_1 49 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_0 7, 223 + sfx_env 15, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 522.20 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_env 15, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_env 15, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_env 8, 1 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_env 8, 1 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_env 8, 1 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 3, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 985.50 + sfx_env 3, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_env 3, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_freq 3971.88 sfx_end diff --git a/src/audio/sfx/sfx_unused_06.asm b/src/audio/sfx/sfx_unused_06.asm index 69b5bd2f..f3ef7c77 100644 --- a/src/audio/sfx/sfx_unused_06.asm +++ b/src/audio/sfx/sfx_unused_06.asm @@ -1,86 +1,86 @@ Sfx_Unused06_Ch1: - sfx_1 241 - sfx_8 17 - sfx_2 8 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 107 - sfx_0 7, 123 - sfx_1 241 - sfx_8 17 - sfx_2 8 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_1 241 - sfx_8 17 - sfx_2 8 - sfx_0 7, 5 - sfx_0 7, 33 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_1 145 - sfx_8 17 - sfx_2 4 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 182 - sfx_0 7, 190 - sfx_1 145 - sfx_8 17 - sfx_2 4 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_1 145 - sfx_8 17 - sfx_2 4 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_1 97 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_0 7, 223 - sfx_1 97 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 97 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 209 - sfx_0 7, 214 - sfx_1 49 - sfx_8 17 - sfx_2 0 - sfx_0 7, 206 - sfx_0 7, 209 - sfx_0 7, 219 - sfx_0 7, 223 - sfx_1 33 - sfx_8 17 - sfx_2 0 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 214 - sfx_0 7, 219 - sfx_1 17 - sfx_8 17 - sfx_2 0 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 209 - sfx_0 7, 214 + sfx_env 15, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 879.68 + sfx_freq 985.50 + sfx_env 15, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_env 15, 1 + sfx_pan %00010001 + sfx_duty 2 + sfx_freq 522.20 + sfx_freq 587.77 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_env 9, 1 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1771.24 + sfx_freq 1985.94 + sfx_env 9, 1 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_env 9, 1 + sfx_pan %00010001 + sfx_duty 1 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_env 6, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_freq 3971.88 + sfx_env 6, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 6, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2788.77 + sfx_freq 3120.76 + sfx_env 3, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2621.44 + sfx_freq 2788.77 + sfx_freq 3542.49 + sfx_freq 3971.88 + sfx_env 2, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 3120.76 + sfx_freq 3542.49 + sfx_env 1, 1 + sfx_pan %00010001 + sfx_duty 0 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2788.77 + sfx_freq 3120.76 sfx_end diff --git a/src/audio/sfx/sfx_unused_09.asm b/src/audio/sfx/sfx_unused_09.asm index 8158142e..e25a8068 100644 --- a/src/audio/sfx/sfx_unused_09.asm +++ b/src/audio/sfx/sfx_unused_09.asm @@ -1,52 +1,52 @@ Sfx_Unused09_Ch1: - sfx_8 17 - sfx_1 224 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_1 128 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 69 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_1 64 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_1 32 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_0 0, 71 - sfx_0 0, 65 - sfx_1 16 - sfx_0 0, 55 - sfx_0 0, 49 - sfx_0 0, 55 - sfx_0 0, 49 - sfx_0 0, 55 + sfx_pan %00010001 + sfx_env 14, 0 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_env 8, 0 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.23 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_env 4, 0 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_env 2, 0 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_freq 66.30 + sfx_freq 66.10 + sfx_env 1, 0 + sfx_freq 65.77 + sfx_freq 65.57 + sfx_freq 65.77 + sfx_freq 65.57 + sfx_freq 65.77 sfx_end diff --git a/src/audio/sfx/sfx_unused_0a.asm b/src/audio/sfx/sfx_unused_0a.asm index 708acd88..50fe0943 100644 --- a/src/audio/sfx/sfx_unused_0a.asm +++ b/src/audio/sfx/sfx_unused_0a.asm @@ -1,74 +1,74 @@ Sfx_Unused0a_Ch1: - sfx_8 17 - sfx_1 228 - sfx_2 0 - sfx_0 7, 57 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_8 17 - sfx_1 132 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_8 17 - sfx_1 196 - sfx_2 0 - sfx_0 7, 57 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_8 17 - sfx_1 84 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_8 17 - sfx_1 132 - sfx_2 0 - sfx_0 7, 57 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_8 17 - sfx_1 52 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 219 - sfx_8 17 - sfx_1 68 - sfx_2 0 - sfx_0 7, 57 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_8 17 - sfx_1 36 - sfx_2 0 - sfx_0 7, 157 - sfx_0 7, 172 - sfx_0 7, 182 - sfx_0 7, 193 - sfx_0 7, 200 - sfx_0 7, 206 - sfx_0 7, 219 + sfx_pan %00010001 + sfx_env 14, 4 + sfx_duty 0 + sfx_freq 658.65 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_pan %00010001 + sfx_env 8, 4 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 12, 4 + sfx_duty 0 + sfx_freq 658.65 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_pan %00010001 + sfx_env 5, 4 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 8, 4 + sfx_duty 0 + sfx_freq 658.65 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_pan %00010001 + sfx_env 3, 4 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 3542.49 + sfx_pan %00010001 + sfx_env 4, 4 + sfx_duty 0 + sfx_freq 658.65 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_pan %00010001 + sfx_env 2, 4 + sfx_duty 0 + sfx_freq 1323.96 + sfx_freq 1560.38 + sfx_freq 1771.24 + sfx_freq 2080.51 + sfx_freq 2340.57 + sfx_freq 2621.44 + sfx_freq 3542.49 sfx_end diff --git a/src/audio/sfx/sfx_unused_0d.asm b/src/audio/sfx/sfx_unused_0d.asm index 285b113d..1accfea3 100644 --- a/src/audio/sfx/sfx_unused_0d.asm +++ b/src/audio/sfx/sfx_unused_0d.asm @@ -1,52 +1,52 @@ Sfx_Unused0d_Ch1: sfx_loop 5 - sfx_8 17 - sfx_1 159 - sfx_2 8 - sfx_0 4, 22 - sfx_5 0 - sfx_6 1 - sfx_0 4, 131 - sfx_6 1 - sfx_0 4, 229 - sfx_6 1 - sfx_0 5, 17 - sfx_6 1 - sfx_0 5, 99 - sfx_6 1 - sfx_0 5, 137 - sfx_6 1 - sfx_0 5, 172 - sfx_6 1 - sfx_8 17 - sfx_1 159 - sfx_2 8 - sfx_0 6, 11 - sfx_0 6, 66 - sfx_0 6, 114 - sfx_0 6, 137 - sfx_0 6, 178 - sfx_0 6, 196 - sfx_0 6, 214 - sfx_8 17 - sfx_1 159 - sfx_2 4 - sfx_0 7, 5 - sfx_0 7, 33 - sfx_0 7, 57 - sfx_0 7, 68 - sfx_0 7, 89 - sfx_0 7, 98 - sfx_0 7, 107 - sfx_8 17 - sfx_1 159 - sfx_2 0 - sfx_0 7, 131 - sfx_0 7, 144 - sfx_0 7, 157 - sfx_0 7, 162 - sfx_0 7, 172 - sfx_0 7, 177 - sfx_0 7, 182 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 2 + sfx_freq 130.81 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 146.78 + sfx_wait 1 + sfx_freq 164.87 + sfx_wait 1 + sfx_freq 174.53 + sfx_wait 1 + sfx_freq 195.92 + sfx_wait 1 + sfx_freq 207.72 + sfx_wait 1 + sfx_freq 219.92 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 2 + sfx_freq 261.62 + sfx_freq 293.88 + sfx_freq 329.33 + sfx_freq 349.53 + sfx_freq 392.43 + sfx_freq 414.78 + sfx_freq 439.84 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 1 + sfx_freq 522.20 + sfx_freq 587.77 + sfx_freq 658.65 + sfx_freq 697.19 + sfx_freq 784.86 + sfx_freq 829.57 + sfx_freq 879.68 + sfx_pan %00010001 + sfx_env 9, -7 + sfx_duty 0 + sfx_freq 1048.58 + sfx_freq 1170.29 + sfx_freq 1323.96 + sfx_freq 1394.38 + sfx_freq 1560.38 + sfx_freq 1659.14 + sfx_freq 1771.24 sfx_endloop sfx_end diff --git a/src/audio/sfx/sfx_unused_0e.asm b/src/audio/sfx/sfx_unused_0e.asm index dc7637a6..5fcc7178 100644 --- a/src/audio/sfx/sfx_unused_0e.asm +++ b/src/audio/sfx/sfx_unused_0e.asm @@ -1,53 +1,53 @@ Sfx_Unused0e_Ch1: - sfx_8 17 - sfx_1 207 - sfx_2 0 - sfx_0 7, 89 - sfx_0 7, 107 - sfx_0 7, 123 - sfx_0 7, 107 - sfx_8 17 - sfx_1 255 - sfx_2 0 - sfx_0 7, 172 - sfx_5 0 - sfx_6 1 - sfx_0 7, 182 - sfx_6 1 - sfx_0 7, 190 - sfx_6 1 - sfx_0 7, 182 - sfx_6 1 - sfx_8 17 - sfx_1 255 - sfx_2 0 - sfx_0 7, 214 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_8 17 - sfx_1 143 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_8 17 - sfx_1 79 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 - sfx_8 17 - sfx_1 31 - sfx_2 0 - sfx_0 7, 223 - sfx_6 1 - sfx_0 7, 219 - sfx_6 1 + sfx_pan %00010001 + sfx_env 12, -7 + sfx_duty 0 + sfx_freq 784.86 + sfx_freq 879.68 + sfx_freq 985.50 + sfx_freq 879.68 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_duty 0 + sfx_freq 1560.38 + sfx_pitch_offset 0 + sfx_wait 1 + sfx_freq 1771.24 + sfx_wait 1 + sfx_freq 1985.94 + sfx_wait 1 + sfx_freq 1771.24 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 15, -7 + sfx_duty 0 + sfx_freq 3120.76 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 8, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 4, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 + sfx_pan %00010001 + sfx_env 1, -7 + sfx_duty 0 + sfx_freq 3971.88 + sfx_wait 1 + sfx_freq 3542.49 + sfx_wait 1 sfx_end diff --git a/src/audio/sfx/sfx_unused_5f.asm b/src/audio/sfx/sfx_unused_5f.asm index 89705948..2df26415 100644 --- a/src/audio/sfx/sfx_unused_5f.asm +++ b/src/audio/sfx/sfx_unused_5f.asm @@ -1,31 +1,31 @@ Sfx_Unused5f_Ch1: - sfx_1 247 - sfx_8 17 - sfx_0 0, 68 - sfx_0 0, 83 - sfx_0 0, 68 - sfx_0 0, 83 - sfx_0 0, 34 - sfx_0 0, 32 - sfx_0 0, 34 - sfx_0 0, 32 - sfx_0 0, 34 - sfx_0 0, 32 - sfx_0 0, 34 - sfx_0 0, 32 - sfx_0 0, 34 - sfx_0 0, 32 - sfx_0 0, 34 - sfx_0 0, 32 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 - sfx_0 0, 16 - sfx_0 0, 17 + sfx_env 15, 7 + sfx_pan %00010001 + sfx_freq 66.20 + sfx_freq 66.70 + sfx_freq 66.20 + sfx_freq 66.70 + sfx_freq 65.08 + sfx_freq 65.02 + sfx_freq 65.08 + sfx_freq 65.02 + sfx_freq 65.08 + sfx_freq 65.02 + sfx_freq 65.08 + sfx_freq 65.02 + sfx_freq 65.08 + sfx_freq 65.02 + sfx_freq 65.08 + sfx_freq 65.02 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 + sfx_freq 64.50 + sfx_freq 64.54 sfx_end diff --git a/src/audio/sfx/sfx_warp.asm b/src/audio/sfx/sfx_warp.asm index 729b0bba..c43afb5f 100644 --- a/src/audio/sfx/sfx_warp.asm +++ b/src/audio/sfx/sfx_warp.asm @@ -1,29 +1,29 @@ Sfx_Warp_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 225 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_1 0 - sfx_5 0 - sfx_6 8 - sfx_5 255 - sfx_1 225 + sfx_env 14, 1 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_env 0, 0 + sfx_pitch_offset 0 + sfx_wait 8 + sfx_pitch_offset -1 + sfx_env 14, 1 sfx_endloop - sfx_1 239 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 143 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_1 79 - sfx_0 0, 66 - sfx_0 0, 66 + sfx_env 14, -7 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 8, -7 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_env 4, -7 + sfx_freq 66.13 + sfx_freq 66.13 sfx_end diff --git a/src/audio/sfx/sfx_water_gun.asm b/src/audio/sfx/sfx_water_gun.asm index 6b59f251..d9a2613a 100644 --- a/src/audio/sfx/sfx_water_gun.asm +++ b/src/audio/sfx/sfx_water_gun.asm @@ -1,74 +1,74 @@ Sfx_WaterGun_Ch1: - sfx_8 17 - sfx_1 111 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 143 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_1 79 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 47 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_1 31 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 + sfx_pan %00010001 + sfx_env 6, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 8, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_env 4, -7 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 2, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_env 1, -7 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 sfx_end diff --git a/src/audio/sfx/sfx_water_jets.asm b/src/audio/sfx/sfx_water_jets.asm index b97a6f96..6bfb296a 100644 --- a/src/audio/sfx/sfx_water_jets.asm +++ b/src/audio/sfx/sfx_water_jets.asm @@ -1,67 +1,67 @@ Sfx_WaterJets_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 111 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 + sfx_env 6, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 sfx_endloop - sfx_1 129 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 80 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_1 65 - sfx_0 0, 81 - sfx_0 0, 80 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_1 33 - sfx_0 0, 80 - sfx_0 0, 81 + sfx_env 8, 1 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.60 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_env 4, 1 + sfx_freq 66.64 + sfx_freq 66.60 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_env 2, 1 + sfx_freq 66.60 + sfx_freq 66.64 sfx_end diff --git a/src/audio/sfx/sfx_whirlpool.asm b/src/audio/sfx/sfx_whirlpool.asm index 983e723b..b2fb764b 100644 --- a/src/audio/sfx/sfx_whirlpool.asm +++ b/src/audio/sfx/sfx_whirlpool.asm @@ -1,64 +1,64 @@ Sfx_Whirlpool_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 111 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 + sfx_env 6, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 sfx_endloop - sfx_1 143 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_1 79 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_1 47 - sfx_0 0, 81 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_1 31 - sfx_0 0, 81 - sfx_0 0, 83 - sfx_0 0, 82 - sfx_0 0, 81 - sfx_0 0, 81 + sfx_env 8, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_env 4, -7 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_env 2, -7 + sfx_freq 66.64 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_env 1, -7 + sfx_freq 66.64 + sfx_freq 66.70 + sfx_freq 66.67 + sfx_freq 66.64 + sfx_freq 66.64 sfx_end diff --git a/src/audio/sfx/sfx_whirlwind.asm b/src/audio/sfx/sfx_whirlwind.asm index 3dd388bc..261d7ba5 100644 --- a/src/audio/sfx/sfx_whirlwind.asm +++ b/src/audio/sfx/sfx_whirlwind.asm @@ -1,94 +1,94 @@ Sfx_Whirlwind_Ch1: - sfx_8 17 + sfx_pan %00010001 sfx_loop 2 - sfx_1 31 - sfx_0 0, 52 - sfx_0 0, 52 - sfx_1 47 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 79 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 111 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 143 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_0 0, 36 - sfx_1 239 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 17 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_0 0, 33 - sfx_1 143 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_1 111 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_0 0, 49 - sfx_1 79 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 47 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_0 0, 65 - sfx_1 31 - sfx_0 0, 66 - sfx_0 0, 66 - sfx_0 0, 66 + sfx_env 1, -7 + sfx_freq 65.67 + sfx_freq 65.67 + sfx_env 2, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 4, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 6, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 8, -7 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_freq 65.15 + sfx_env 14, -7 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 64.54 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_freq 65.05 + sfx_env 8, -7 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_env 6, -7 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_freq 65.57 + sfx_env 4, -7 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 2, -7 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_freq 66.10 + sfx_env 1, -7 + sfx_freq 66.13 + sfx_freq 66.13 + sfx_freq 66.13 sfx_end diff --git a/src/audio/sfx/sfx_white_gas.asm b/src/audio/sfx/sfx_white_gas.asm index d1823253..ac873455 100644 --- a/src/audio/sfx/sfx_white_gas.asm +++ b/src/audio/sfx/sfx_white_gas.asm @@ -1,50 +1,50 @@ Sfx_WhiteGas_Ch1: - sfx_8 17 - sfx_1 47 - sfx_0 0, 8 - sfx_0 0, 8 - sfx_0 0, 8 - sfx_1 79 - sfx_0 0, 7 - sfx_0 0, 7 - sfx_0 0, 7 - sfx_1 111 - sfx_0 0, 6 - sfx_0 0, 6 - sfx_0 0, 6 - sfx_1 143 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 + sfx_pan %00010001 + sfx_env 2, -7 + sfx_freq 64.25 + sfx_freq 64.25 + sfx_freq 64.25 + sfx_env 4, -7 + sfx_freq 64.22 + sfx_freq 64.22 + sfx_freq 64.22 + sfx_env 6, -7 + sfx_freq 64.19 + sfx_freq 64.19 + sfx_freq 64.19 + sfx_env 8, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 sfx_loop 12 - sfx_1 207 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 - sfx_0 0, 4 + sfx_env 12, -7 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 + sfx_freq 64.13 sfx_endloop - sfx_1 143 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 127 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 95 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_1 47 - sfx_0 0, 5 - sfx_0 0, 5 - sfx_0 0, 5 + sfx_env 8, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 7, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 5, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_env 2, -7 + sfx_freq 64.16 + sfx_freq 64.16 + sfx_freq 64.16 sfx_end diff --git a/src/audio/wave_instruments.asm b/src/audio/wave_instruments.asm index 98197dc0..6fd7345a 100644 --- a/src/audio/wave_instruments.asm +++ b/src/audio/wave_instruments.asm @@ -5,16 +5,16 @@ dw .wave4 .wave0 - db $79,$bd,$ff,$ff,$ff,$ff,$fd,$b9,$75,$31,$00,$00,$00,$00,$01,$35 + dn $7,$9,$b,$d,$f,$f,$f,$f,$f,$f,$f,$f,$f,$d,$b,$9,$7,$5,$3,$1,$0,$0,$0,$0,$0,$0,$0,$0,$0,$1,$3,$5 .wave1 - db $01,$12,$23,$34,$45,$56,$67,$77,$88,$99,$aa,$bb,$cc,$dd,$ee,$ff + dn $0,$1,$1,$2,$2,$3,$3,$4,$4,$5,$5,$6,$6,$7,$7,$7,$8,$8,$9,$9,$a,$a,$b,$b,$c,$c,$d,$d,$e,$e,$f,$f .wave2 - db $46,$8a,$cc,$cc,$cc,$cc,$ca,$86,$42,$11,$00,$00,$00,$00,$01,$12 + dn $4,$6,$8,$a,$c,$c,$c,$c,$c,$c,$c,$c,$c,$a,$8,$6,$4,$2,$1,$1,$0,$0,$0,$0,$0,$0,$0,$0,$0,$1,$1,$2 .wave3 - db $7a,$df,$ff,$da,$74,$10,$00,$14,$7a,$df,$ff,$da,$74,$10,$00,$14 + dn $7,$a,$d,$f,$f,$f,$d,$a,$7,$4,$1,$0,$0,$0,$1,$4,$7,$a,$d,$f,$f,$f,$d,$a,$7,$4,$1,$0,$0,$0,$1,$4 .wave4 - db $ee,$ee,$ee,$ee,$ee,$ee,$ee,$ee,$00,$00,$00,$00,$00,$00,$00,$00 + dn $e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$e,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0,$0 diff --git a/src/macros/audio.asm b/src/macros/audio.asm index f552e943..99c52050 100644 --- a/src/macros/audio.asm +++ b/src/macros/audio.asm @@ -149,16 +149,24 @@ MACRO music_end db $ff ENDM -MACRO sfx_0 - db \1, \2 +; \1 = frequency value in Hz +MACRO sfx_freq +DEF x = $800 - DIV($20000, \1) +ASSERT x < $800 + db HIGH(x), LOW(x) ENDM -MACRO sfx_1 - db $10, \1 +MACRO sfx_env + db $10 + IF \2 < 0 + dn \1, %1000 | (\2 * -1) + ELSE + dn \1, \2 + ENDC ENDM -MACRO sfx_2 - db $20 | \1 +MACRO sfx_duty + db $20 | (\1 << 2) ENDM MACRO sfx_loop @@ -169,15 +177,19 @@ MACRO sfx_endloop db $40 ENDM -MACRO sfx_5 +MACRO sfx_pitch_offset db $50, \1 ENDM -MACRO sfx_6 +MACRO sfx_wait db $60, \1 ENDM -MACRO sfx_8 +MACRO sfx_wave + db $70 | \1 +ENDM + +MACRO sfx_pan db $80, \1 ENDM diff --git a/src/macros/data.asm b/src/macros/data.asm index e03ca8f5..7b7160df 100644 --- a/src/macros/data.asm +++ b/src/macros/data.asm @@ -1,5 +1,8 @@ MACRO dn +REPT _NARG / 2 db ((\1) << 4) | (\2) + SHIFT 2 +ENDR ENDM MACRO dbw diff --git a/src/wram.asm b/src/wram.asm index 9d3dd165..6f026bbb 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -3129,7 +3129,7 @@ wde2b:: ; de2b wde2e:: ; de2e ds $1 -wde2f:: ; de2f +wSFXPitchOffsets:: ; de2f ds $3 wde32:: ; de32 @@ -3150,10 +3150,10 @@ wde3f:: ; de3f wde43:: ; de43 ds $8 -wde4b:: ; de4b +wSFXCommandPointers:: ; de4b ds $8 -wde53:: ; de53 +wSFXIsPlaying:: ; de53 ds $1 wde54:: ; de54